diff --git a/.htaccess b/.htaccess
old mode 100755
new mode 100644
index 4ba5095e14..714e8af213
--- a/.htaccess
+++ b/.htaccess
@@ -6,8 +6,6 @@ RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
 </IfModule>
 </IfModule>
 </IfModule>
-ErrorDocument 403 /core/templates/403.php
-ErrorDocument 404 /core/templates/404.php
 <IfModule mod_php5.c>
 php_value upload_max_filesize 513M
 php_value post_max_size 513M
@@ -20,12 +18,12 @@ php_value mbstring.func_overload 0
 <IfModule mod_rewrite.c>
 RewriteEngine on
 RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L]
-RewriteRule ^.well-known/host-meta.json /public.php?service=host-meta-json [QSA,L]
-RewriteRule ^.well-known/carddav /remote.php/carddav/ [R]
-RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]	
-RewriteRule ^apps/calendar/caldav.php remote.php/caldav/ [QSA,L]
-RewriteRule ^apps/contacts/carddav.php remote.php/carddav/ [QSA,L]
+RewriteRule ^\.well-known/host-meta /public.php?service=host-meta [QSA,L]
+RewriteRule ^\.well-known/host-meta\.json /public.php?service=host-meta-json [QSA,L]
+RewriteRule ^\.well-known/carddav /remote.php/carddav/ [R]
+RewriteRule ^\.well-known/caldav /remote.php/caldav/ [R]
+RewriteRule ^apps/calendar/caldav\.php remote.php/caldav/ [QSA,L]
+RewriteRule ^apps/contacts/carddav\.php remote.php/carddav/ [QSA,L]
 RewriteRule ^apps/([^/]*)/(.*\.(php))$ index.php?app=$1&getfile=$2 [QSA,L]
 RewriteRule ^remote/(.*) remote.php [QSA,L]
 </IfModule>
diff --git a/.jshintrc b/.jshintrc
index 77f9e9f143..d5da3e3082 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -26,6 +26,7 @@
 		"fakeServer": true,
 		"_": true,
 		"OC": true,
+		"OCA": true,
 		"t": true,
 		"n": true
 	}
diff --git a/3rdparty b/3rdparty
index da3c9f651a..ef80977061 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit da3c9f651a26cf076249ebf25c477e3791e69ca3
+Subproject commit ef80977061d4bc3a2d8ee0bf23a8287a3222b628
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 70bd85fabf..ff3b270320 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ If you have questions about how to install or use ownCloud, please direct these
 Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
 
 [template]: https://raw.github.com/owncloud/core/master/issue_template.md
-[mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud
+[mailinglist]: http://mailman.owncloud.org/mailman/listinfo/owncloud
 [forum]: http://forum.owncloud.org/
 [irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4
 
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index 2d76b68501..bae3628402 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -17,8 +17,11 @@ $baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
 
 $permissions = $dirInfo->getPermissions();
 
+$sortAttribute = isset( $_GET['sort'] ) ? $_GET['sort'] : 'name';
+$sortDirection = isset( $_GET['sortdirection'] ) ? ($_GET['sortdirection'] === 'desc') : false;
+
 // make filelist
-$files = \OCA\Files\Helper::getFiles($dir);
+$files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection);
 
 $data['directory'] = $dir;
 $data['files'] = \OCA\Files\Helper::formatFileInfos($files);
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 15a2913378..4b0db457ad 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -19,3 +19,13 @@ $templateManager->registerTemplate('text/html', 'core/templates/filetemplates/te
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.presentation', 'core/templates/filetemplates/template.odp');
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
+
+\OCA\Files\App::getNavigationManager()->add(
+	array(
+		"id" => 'files',
+		"appname" => 'files',
+		"script" => 'list.php',
+		"order" => 0,
+		"name" => $l->t('All files')
+	)
+);
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
deleted file mode 100644
index f920f84216..0000000000
--- a/apps/files/appinfo/update.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-// fix webdav properties,add namespace in front of the property, update for OC4.5
-$installedVersion=OCP\Config::getAppValue('files', 'installed_version');
-if (version_compare($installedVersion, '1.1.6', '<')) {
-	$concat = OC_DB::getConnection()->getDatabasePlatform()->
-		getConcatExpression( '\'{DAV:}\'', '`propertyname`' );
-	$query = OC_DB::prepare('
-		UPDATE `*PREFIX*properties`
-		SET    `propertyname` = ' . $concat . '
-		WHERE  `propertyname` NOT LIKE \'{%\'
-	');
-	$query->execute();
-}
-
-//update from OC 3
-
-//try to remove remaining files.
-//Give a warning if not possible
-
-$filesToRemove = array(
-	'ajax',
-	'appinfo',
-	'css',
-	'js',
-	'l10n',
-	'templates',
-	'admin.php',
-	'download.php',
-	'index.php',
-	'settings.php'
-);
-
-foreach($filesToRemove as $file) {
-	$filepath = OC::$SERVERROOT . '/files/' . $file;
-	if(!file_exists($filepath)) {
-		continue;
-	}
-	$success = OCP\Files::rmdirr($filepath);
-	if($success === false) {
-		//probably not sufficient privileges, give up and give a message.
-		OCP\Util::writeLog('files', 'Could not clean /files/ directory.'
-				.' Please remove everything except webdav.php from ' . OC::$SERVERROOT . '/files/', OCP\Util::ERROR);
-		break;
-	}
-}
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 474f1af072..009cb355ba 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -3,10 +3,11 @@
  See the COPYING-README file. */
 
 /* FILE MENU */
-.actions { padding:5px; height:32px; width: 100%; }
+.actions { padding:5px; height:32px; display: inline-block; float: left; }
 .actions input, .actions button, .actions .button { margin:0; float:left; }
 .actions .button a { color: #555; }
 .actions .button a:hover, .actions .button a:active { color: #333; }
+.actions.hidden { display: none; }
 
 #new {
 	z-index: 1010;
@@ -75,6 +76,7 @@
 	top: 44px;
 	width: 100%;
 }
+
 /* make sure there's enough room for the file actions */
 #body-user #filestable {
 	min-width: 688px; /* 768 (mobile break) - 80 (nav width) */
@@ -83,6 +85,40 @@
 	min-width: 688px; /* 768 (mobile break) - 80 (nav width) */
 }
 
+#filestable tbody tr { background-color:#fff; height:51px; }
+
+.app-files #app-content {
+	position: relative;
+}
+
+/**
+ * Override global #controls styles
+ * to be more flexible / relative
+ */
+#body-user .app-files #controls {
+	left: 310px; /* main nav bar + sidebar */
+	position: fixed;
+	padding-left: 0px;
+}
+
+/* this is mostly for file viewer apps, text editor, etc */
+#body-user .app-files.no-sidebar #controls {
+	left: 0px;
+	padding-left: 80px; /* main nav bar */
+}
+
+.app-files #app-navigation {
+	width: 230px;
+}
+
+.app-files #app-settings {
+	width: 229px; /* DUH */
+}
+
+.app-files #app-settings input {
+	width: 90%;
+}
+
 #filestable tbody tr { background-color:#fff; height:40px; }
 #filestable tbody tr:hover, tbody tr:active {
 	background-color: rgb(240,240,240);
@@ -116,10 +152,29 @@ tr:hover span.extension {
 
 table tr.mouseOver td { background-color:#eee; }
 table th { height:24px; padding:0 8px; color:#999; }
-table th .name {
-	position: absolute;
-	left: 55px;
-	top: 15px;
+table th .columntitle {
+	display: inline-block;
+	padding: 15px;
+	width: 100%;
+	height: 50px;
+	box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	vertical-align: middle;
+}
+table th .columntitle.name {
+	padding-left: 5px;
+	margin-left: 50px;
+	max-width: 300px;
+}
+/* hover effect on sortable column */
+table th a.columntitle:hover {
+	background-color: #F0F0F0;
+}
+table th .sort-indicator {
+	width: 10px;
+	height: 8px;
+	margin-left: 10px;
+	display: inline-block;
 }
 table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; }
 table td {
@@ -139,8 +194,11 @@ table th#headerName {
 }
 table th#headerSize, table td.filesize {
 	min-width: 48px;
-	padding: 0 16px;
 	text-align: right;
+	padding: 0;
+}
+table table td.filesize {
+	padding: 0 16px;
 }
 table th#headerDate, table td.date {
 	-moz-box-sizing: border-box;
@@ -161,9 +219,7 @@ table.multiselect thead {
 	z-index: 10;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
-	left: 0;
-	padding-left: 80px;
-	width: 100%;
+	left: 310px; /* main nav bar + sidebar */
 }
 
 table.multiselect thead th {
@@ -197,10 +253,6 @@ table td.filename input.filename {
 table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:3px 8px 8px 3px; }
 table td.filename .nametext, .uploadtext, .modified { float:left; padding:14px 0; }
 
-#modified {
-	position: absolute;
-	top: 15px;
-}
 .modified {
 	position: relative;
 	padding-left: 8px;
@@ -254,7 +306,7 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; }
 
 /* Use label to have bigger clickable size for checkbox */
 #fileList tr td.filename>input[type="checkbox"] + label,
-#select_all + label {
+.select-all + label {
 	height: 50px;
 	position: absolute;
 	width: 50px;
@@ -268,10 +320,10 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; }
 #fileList tr td.filename>input[type="checkbox"] + label {
 	left: 0;
 }
-#select_all + label {
+.select-all + label {
 	top: 0;
 }
-#select_all {
+.select-all {
 	position: absolute;
 	top: 18px;
 	left: 18px;
@@ -310,7 +362,6 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 
 /* Actions for selected files */
 .selectedActions {
-	display: none;
 	position: absolute;
 	top: -1px;
 	right: 0;
@@ -320,6 +371,9 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 	display: inline;
 	padding: 17px 5px;
 }
+.selectedActions a.hidden {
+	display: none;
+}
 .selectedActions a img {
 	position:relative;
 	top:5px;
@@ -395,7 +449,7 @@ table.dragshadow td.size {
 }
 .mask {
 	z-index: 50;
-	position: fixed;
+	position: absolute;
 	top: 0;
 	left: 0;
 	right: 0;
diff --git a/apps/files/index.php b/apps/files/index.php
index b8ff08c1b0..e24c535cb2 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -28,36 +28,33 @@ OCP\User::checkLoggedIn();
 OCP\Util::addStyle('files', 'files');
 OCP\Util::addStyle('files', 'upload');
 OCP\Util::addStyle('files', 'mobile');
+OCP\Util::addscript('files', 'app');
 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', 'filesummary');
 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, false);
-// Redirect if directory does not exist
-if (!$dirInfo || !$dirInfo->getType() === 'dir') {
-	header('Location: ' . OCP\Util::getScriptName() . '');
-	exit();
-}
 
 $isIE8 = false;
 preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
-if (count($matches) > 0 && $matches[1] <= 8){
+if (count($matches) > 0 && $matches[1] <= 9) {
 	$isIE8 = true;
 }
 
-// if IE8 and "?dir=path" was specified, reformat the URL to use a hash like "#?dir=path"
-if ($isIE8 && isset($_GET['dir'])){
-	if ($dir === ''){
-		$dir = '/';
+// if IE8 and "?dir=path&view=someview" was specified, reformat the URL to use a hash like "#?dir=path&view=someview"
+if ($isIE8 && (isset($_GET['dir']) || isset($_GET['view']))) {
+	$hash = '#?';
+	$dir = isset($_GET['dir']) ? $_GET['dir'] : '/';
+	$view = isset($_GET['view']) ? $_GET['view'] : 'files';
+	$hash = '#?dir=' . \OCP\Util::encodePath($dir);
+	if ($view !== 'files') {
+		$hash .= '&view=' . urlencode($view);
 	}
-	header('Location: ' . OCP\Util::linkTo('files', 'index.php') . '#?dir=' . \OCP\Util::encodePath($dir));
+	header('Location: ' . OCP\Util::linkTo('files', 'index.php') . $hash);
 	exit();
 }
 
@@ -65,49 +62,62 @@ $user = OC_User::getUser();
 
 $config = \OC::$server->getConfig();
 
-// needed for share init, permissions will be reloaded
-// anyway with ajax load
-$permissions = $dirInfo->getPermissions();
-
-// information about storage capacities
-$storageInfo=OC_Helper::getStorageInfo($dir, $dirInfo);
-$freeSpace=$storageInfo['free'];
-$uploadLimit=OCP\Util::uploadLimit();
-$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir, $freeSpace);
-$publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes');
+// mostly for the home storage's free space
+$dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
+$storageInfo=OC_Helper::getStorageInfo('/', $dirInfo);
 // if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code)
 $encryptionInitStatus = 2;
 if (OC_App::isEnabled('files_encryption')) {
-    $session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
-    $encryptionInitStatus = $session->getInitialized();
+	$session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
+	$encryptionInitStatus = $session->getInitialized();
 }
 
-$trashEnabled = \OCP\App::isEnabled('files_trashbin');
-$trashEmpty = true;
-if ($trashEnabled) {
-    $trashEmpty = \OCA\Files_Trashbin\Trashbin::isEmpty($user);
+$nav = new OCP\Template('files', 'appnavigation', '');
+
+$navItems = \OCA\Files\App::getNavigationManager()->getAll();
+$nav->assign('navigationItems', $navItems);
+
+$contentItems = array();
+
+function renderScript($appName, $scriptName) {
+	$content = '';
+	$appPath = OC_App::getAppPath($appName);
+	$scriptPath = $appPath . '/' . $scriptName;
+	if (file_exists($scriptPath)) {
+		// TODO: sanitize path / script name ?
+		ob_start();
+		include $scriptPath;
+		$content = ob_get_contents();
+		@ob_end_clean();
+	}
+	return $content;
+}
+
+// render the container content for every navigation item
+foreach ($navItems as $item) {
+	$content = '';
+	if (isset($item['script'])) {
+		$content = renderScript($item['appname'], $item['script']);
+	}
+	$contentItem = array();
+	$contentItem['id'] = $item['id'];
+	$contentItem['content'] = $content;
+	$contentItems[] = $contentItem;
 }
 
 OCP\Util::addscript('files', 'fileactions');
 OCP\Util::addscript('files', 'files');
+OCP\Util::addscript('files', 'navigation');
 OCP\Util::addscript('files', 'keyboardshortcuts');
 $tmpl = new OCP\Template('files', 'index', 'user');
-$tmpl->assign('dir', $dir);
-$tmpl->assign('permissions', $permissions);
-$tmpl->assign('trash', $trashEnabled);
-$tmpl->assign('trashEmpty', $trashEmpty);
-$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize); // minimium of freeSpace and uploadLimit
-$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-$tmpl->assign('freeSpace', $freeSpace);
-$tmpl->assign('uploadLimit', $uploadLimit); // PHP upload limit
-$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 $tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
 $tmpl->assign('isPublic', false);
-$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
 $tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
 $tmpl->assign("mailNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_mail_notification', 'yes'));
 $tmpl->assign("allowShareWithLink", $config->getAppValue('core', 'shareapi_allow_links', 'yes'));
 $tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
-$tmpl->assign('disableSharing', false);
+$tmpl->assign('appNavigation', $nav);
+$tmpl->assign('appContents', $contentItems);
+$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 
 $tmpl->printPage();
diff --git a/apps/files/js/app.js b/apps/files/js/app.js
new file mode 100644
index 0000000000..9155fb38cd
--- /dev/null
+++ b/apps/files/js/app.js
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2014
+ *
+ * @author Vincent Petry
+ * @copyright 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.
+ *
+ */
+
+/* global dragOptions, folderDropOptions */
+(function() {
+
+	if (!OCA.Files) {
+		OCA.Files = {};
+	}
+
+	var App = {
+		navigation: null,
+
+		initialize: function() {
+			this.navigation = new OCA.Files.Navigation($('#app-navigation'));
+
+			// TODO: ideally these should be in a separate class / app (the embedded "all files" app)
+			this.fileActions = OCA.Files.FileActions;
+			this.files = OCA.Files.Files;
+
+			this.fileList = new OCA.Files.FileList(
+				$('#app-content-files'), {
+					scrollContainer: $('#app-content'),
+					dragOptions: dragOptions,
+					folderDropOptions: folderDropOptions
+				}
+			);
+			this.files.initialize();
+			this.fileActions.registerDefaultActions(this.fileList);
+			this.fileList.setFileActions(this.fileActions);
+
+			// for backward compatibility, the global FileList will
+			// refer to the one of the "files" view
+			window.FileList = this.fileList;
+
+			this._setupEvents();
+			// trigger URL change event handlers
+			this._onPopState(OC.Util.History.parseUrlQuery());
+		},
+
+		/**
+		 * Returns the container of the currently visible app.
+		 *
+		 * @return app container
+		 */
+		getCurrentAppContainer: function() {
+			return this.navigation.getActiveContainer();
+		},
+
+		/**
+		 * Setup events based on URL changes
+		 */
+		_setupEvents: function() {
+			OC.Util.History.addOnPopStateHandler(_.bind(this._onPopState, this));
+
+			// detect when app changed their current directory
+			$('#app-content').delegate('>div', 'changeDirectory', _.bind(this._onDirectoryChanged, this));
+			$('#app-content').delegate('>div', 'changeViewerMode', _.bind(this._onChangeViewerMode, this));
+
+			$('#app-navigation').on('itemChanged', _.bind(this._onNavigationChanged, this));
+		},
+
+		/**
+		 * Event handler for when the current navigation item has changed
+		 */
+		_onNavigationChanged: function(e) {
+			var params;
+			if (e && e.itemId) {
+				params = {
+					view: e.itemId,
+					dir: '/'
+				};
+				this._changeUrl(params.view, params.dir);
+				this.navigation.getActiveContainer().trigger(new $.Event('urlChanged', params));
+			}
+		},
+
+		/**
+		 * Event handler for when an app notified that its directory changed
+		 */
+		_onDirectoryChanged: function(e) {
+			if (e.dir) {
+				this._changeUrl(this.navigation.getActiveItem(), e.dir);
+			}
+		},
+
+		/**
+		 * Event handler for when an app notifies that it needs space
+		 * for viewer mode.
+		 */
+		_onChangeViewerMode: function(e) {
+			var state = !!e.viewerModeEnabled;
+			$('#app-navigation').toggleClass('hidden', state);
+			$('.app-files').toggleClass('viewer-mode no-sidebar', state);
+		},
+
+		/**
+		 * Event handler for when the URL changed
+		 */
+		_onPopState: function(params) {
+			params = _.extend({
+				dir: '/',
+				view: 'files'
+			}, params);
+			var lastId = this.navigation.getActiveItem();
+			if (!this.navigation.itemExists(params.view)) {
+				params.view = 'files';
+			}
+			this.navigation.setActiveItem(params.view, {silent: true});
+			if (lastId !== this.navigation.getActiveItem()) {
+				this.navigation.getActiveContainer().trigger(new $.Event('show'));
+			}
+			this.navigation.getActiveContainer().trigger(new $.Event('urlChanged', params));
+		},
+
+		/**
+		 * Change the URL to point to the given dir and view
+		 */
+		_changeUrl: function(view, dir) {
+			var params = {dir: dir};
+			if (view !== 'files') {
+				params.view = view;
+			}
+			OC.Util.History.pushState(params);
+		}
+	};
+	OCA.Files.App = App;
+})();
+
+$(document).ready(function() {
+	// wait for other apps/extensions to register their event handlers
+	// in the "ready" clause
+	_.defer(function() {
+		OCA.Files.App.initialize();
+	});
+});
+
diff --git a/apps/files/js/breadcrumb.js b/apps/files/js/breadcrumb.js
index 5bc2fac136..c017d710d6 100644
--- a/apps/files/js/breadcrumb.js
+++ b/apps/files/js/breadcrumb.js
@@ -159,7 +159,11 @@
 			this.totalWidth = 64;
 			// FIXME: this class should not know about global elements
 			if ( $('#navigation').length ) {
-				this.totalWidth += $('#navigation').get(0).offsetWidth;
+				this.totalWidth += $('#navigation').outerWidth();
+			}
+
+			if ( $('#app-navigation').length && !$('#app-navigation').hasClass('hidden')) {
+				this.totalWidth += $('#app-navigation').outerWidth();
 			}
 			this.hiddenBreadcrumbs = 0;
 
@@ -167,8 +171,8 @@
 				this.totalWidth += $(this.breadcrumbs[i]).get(0).offsetWidth;
 			}
 
-			$.each($('#controls .actions>div'), function(index, action) {
-				self.totalWidth += $(action).get(0).offsetWidth;
+			$.each($('#controls .actions'), function(index, action) {
+				self.totalWidth += $(action).outerWidth();
 			});
 
 		},
@@ -236,6 +240,6 @@
 		}
 	};
 
-	window.BreadCrumb = BreadCrumb;
+	OCA.Files.BreadCrumb = BreadCrumb;
 })();
 
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 03ebdccb32..6b0ca79368 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -18,7 +18,7 @@
  *    - TODO music upload button
  */
 
-/* global OC, t, n */
+/* global Files, FileList, jQuery, oc_requesttoken, humanFileSize, getUniqueName */
 
 /**
  * Function that will allow us to know if Ajax uploads are supported
@@ -65,7 +65,7 @@ OC.Upload = {
 	 */
 	cancelUploads:function() {
 		this.log('canceling uploads');
-		jQuery.each(this._uploads,function(i, jqXHR) {
+		jQuery.each(this._uploads, function(i, jqXHR) {
 			jqXHR.abort();
 		});
 		this._uploads = [];
@@ -83,7 +83,7 @@ OC.Upload = {
 	isProcessing:function() {
 		var count = 0;
 
-		jQuery.each(this._uploads,function(i, data) {
+		jQuery.each(this._uploads, function(i, data) {
 			if (data.state() === 'pending') {
 				count++;
 			}
@@ -205,14 +205,16 @@ OC.Upload = {
 				 */
 				add: function(e, data) {
 					OC.Upload.log('add', e, data);
-					var that = $(this);
-					var freeSpace;
+					var that = $(this), freeSpace;
 
-					// we need to collect all data upload objects before starting the upload so we can check their existence
-					// and set individual conflict actions. unfortunately there is only one variable that we can use to identify
-					// the selection a data upload is part of, so we have to collect them in data.originalFiles
-					// turning singleFileUploads off is not an option because we want to gracefully handle server errors like
-					// already exists
+					// we need to collect all data upload objects before
+					// starting the upload so we can check their existence
+					// and set individual conflict actions. Unfortunately,
+					// there is only one variable that we can use to identify
+					// the selection a data upload is part of, so we have to
+					// collect them in data.originalFiles turning
+					// singleFileUploads off is not an option because we want
+					// to gracefully handle server errors like 'already exists'
 
 					// create a container where we can store the data objects
 					if ( ! data.originalFiles.selection ) {
@@ -244,14 +246,15 @@ OC.Upload = {
 
 					// in case folder drag and drop is not supported file will point to a directory
 					// http://stackoverflow.com/a/20448357
-					if (!file.type && file.size%4096 === 0 && file.size <= 102400) {
+					if ( ! file.type && file.size%4096 === 0 && file.size <= 102400) {
 						try {
-							reader = new FileReader();
-							reader.readAsBinaryString(f);
+							var reader = new FileReader();
+							reader.readAsBinaryString(file);
 						} catch (NS_ERROR_FILE_ACCESS_DENIED) {
 							//file is a directory
 							data.textStatus = 'dirorzero';
-							data.errorThrown = t('files', 'Unable to upload {filename} as it is a directory or has 0 bytes',
+							data.errorThrown = t('files',
+								'Unable to upload {filename} as it is a directory or has 0 bytes',
 								{filename: file.name}
 							);
 						}
@@ -263,7 +266,8 @@ OC.Upload = {
 					// check PHP upload limit
 					if (selection.totalBytes > $('#upload_limit').val()) {
 						data.textStatus = 'sizeexceedlimit';
-						data.errorThrown = t('files', 'Total file size {size1} exceeds upload limit {size2}', {
+						data.errorThrown = t('files',
+							'Total file size {size1} exceeds upload limit {size2}', {
 							'size1': humanFileSize(selection.totalBytes),
 							'size2': humanFileSize($('#upload_limit').val())
 						});
@@ -273,7 +277,8 @@ OC.Upload = {
 					freeSpace = $('#free_space').val();
 					if (freeSpace >= 0 && selection.totalBytes > freeSpace) {
 						data.textStatus = 'notenoughspace';
-						data.errorThrown = t('files', 'Not enough free space, you are uploading {size1} but only {size2} is left', {
+						data.errorThrown = t('files',
+							'Not enough free space, you are uploading {size1} but only {size2} is left', {
 							'size1': humanFileSize(selection.totalBytes),
 							'size2': humanFileSize($('#free_space').val())
 						});
@@ -341,7 +346,7 @@ OC.Upload = {
 						// noone set update parameters, we set the minimum
 						data.formData = {
 							requesttoken: oc_requesttoken,
-							dir: $('#dir').val(),
+							dir: FileList.getCurrentDirectory(),
 							file_directory: fileDirectory
 						};
 					}
@@ -384,31 +389,29 @@ OC.Upload = {
 						//fetch response from iframe
 						response = data.result[0].body.innerText;
 					}
-					var result=$.parseJSON(response);
+					var result = $.parseJSON(response);
 
 					delete data.jqXHR;
 
+					var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+
 					if (result.status === 'error' && result.data && result.data.message){
 						data.textStatus = 'servererror';
 						data.errorThrown = result.data.message;
-						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
 						fu._trigger('fail', e, data);
 					} else if (typeof result[0] === 'undefined') {
 						data.textStatus = 'servererror';
 						data.errorThrown = t('files', 'Could not get result from server.');
-						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
 						fu._trigger('fail', e, data);
 					} else if (result[0].status === 'existserror') {
 						//show "file already exists" dialog
 						var original = result[0];
 						var replacement = data.files[0];
-						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
 						OC.dialogs.fileexists(data, original, replacement, OC.Upload, fu);
 					} else if (result[0].status !== 'success') {
 						//delete data.jqXHR;
 						data.textStatus = 'servererror';
 						data.errorThrown = result[0].data.message; // error message has been translated on server
-						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
 						fu._trigger('fail', e, data);
 					}
 				},
@@ -440,7 +443,7 @@ OC.Upload = {
 				fileupload.on('fileuploadstart', function(e, data) {
 					OC.Upload.log('progress handle fileuploadstart', e, data);
 					$('#uploadprogresswrapper input.stop').show();
-					$('#uploadprogressbar').progressbar({value:0});
+					$('#uploadprogressbar').progressbar({value: 0});
 					$('#uploadprogressbar').fadeIn();
 				});
 				fileupload.on('fileuploadprogress', function(e, data) {
@@ -457,7 +460,6 @@ OC.Upload = {
 
 					$('#uploadprogresswrapper input.stop').fadeOut();
 					$('#uploadprogressbar').fadeOut();
-					Files.updateStorageStatistics();
 				});
 				fileupload.on('fileuploadfail', function(e, data) {
 					OC.Upload.log('progress handle fileuploadfail', e, data);
@@ -468,8 +470,6 @@ OC.Upload = {
 					}
 				});
 
-			} else {
-				console.log('skipping file progress because your browser is broken');
 			}
 		}
 
@@ -509,7 +509,7 @@ OC.Upload = {
 			$('#new li').each(function(i,element) {
 				if ($(element).children('p').length === 0) {
 					$(element).children('form').remove();
-					$(element).append('<p>'+$(element).data('text')+'</p>');
+					$(element).append('<p>' + $(element).data('text') + '</p>');
 				}
 			});
 		});
@@ -527,16 +527,16 @@ OC.Upload = {
 
 			$('#new .error').tipsy('hide');
 
-			$('#new li').each(function(i,element) {
+			$('#new li').each(function(i, element) {
 				if ($(element).children('p').length === 0) {
 					$(element).children('form').remove();
-					$(element).append('<p>'+$(element).data('text')+'</p>');
+					$(element).append('<p>' + $(element).data('text') + '</p>');
 				}
 			});
 
-			var type=$(this).data('type');
-			var text=$(this).children('p').text();
-			$(this).data('text',text);
+			var type = $(this).data('type');
+			var text = $(this).children('p').text();
+			$(this).data('text', text);
 			$(this).children('p').remove();
 
 			// add input field
@@ -553,7 +553,7 @@ OC.Upload = {
 				var filename = input.val();
 				if (type === 'web' && filename.length === 0) {
 					throw t('files', 'URL cannot be empty');
-				} else if (type !== 'web' && !Files.isFileNameValid(filename)) {
+				} else if (type !== 'web' && ! Files.isFileNameValid(filename)) {
 					// Files.isFileNameValid(filename) throws an exception itself
 				} else if (FileList.inList(filename)) {
 					throw t('files', '{new_name} already exists', {new_name: filename});
@@ -592,7 +592,7 @@ OC.Upload = {
 					if (FileList.lastAction) {
 						FileList.lastAction();
 					}
-					var name = getUniqueName(newname);
+					var name = FileList.getUniqueName(newname);
 					if (newname !== name) {
 						FileList.checkName(name, newname, true);
 						var hidden = true;
@@ -603,10 +603,13 @@ OC.Upload = {
 						case 'file':
 							$.post(
 								OC.filePath('files', 'ajax', 'newfile.php'),
-								{dir:$('#dir').val(), filename:name},
+								{
+									dir: FileList.getCurrentDirectory(),
+									filename: name
+								},
 								function(result) {
 									if (result.status === 'success') {
-										FileList.add(result.data, {hidden: hidden, insert: true});
+										FileList.add(result.data, {hidden: hidden, animate: true});
 									} else {
 										OC.dialogs.alert(result.data.message, t('core', 'Could not create file'));
 									}
@@ -616,10 +619,13 @@ OC.Upload = {
 						case 'folder':
 							$.post(
 								OC.filePath('files','ajax','newfolder.php'),
-								{dir:$('#dir').val(), foldername:name},
+								{
+									dir: FileList.getCurrentDirectory(),
+									foldername: name
+								},
 								function(result) {
 									if (result.status === 'success') {
-										FileList.add(result.data, {hidden: hidden, insert: true});
+										FileList.add(result.data, {hidden: hidden, animate: true});
 									} else {
 										OC.dialogs.alert(result.data.message, t('core', 'Could not create folder'));
 									}
@@ -627,39 +633,46 @@ OC.Upload = {
 							);
 							break;
 						case 'web':
-							if (name.substr(0,8) !== 'https://' && name.substr(0,7) !== 'http://') {
+							if (name.substr(0, 8) !== 'https://' && name.substr(0, 7) !== 'http://') {
 								name = 'http://' + name;
 							}
-							var localName=name;
-							if (localName.substr(localName.length-1,1)==='/') {//strip /
-								localName=localName.substr(0,localName.length-1);
+							var localName = name;
+							if (localName.substr(localName.length-1, 1) === '/') {//strip /
+								localName = localName.substr(0, localName.length-1);
 							}
-							if (localName.indexOf('/')) {//use last part of url
-								localName=localName.split('/').pop();
+							if (localName.indexOf('/')) { //use last part of url
+								localName = localName.split('/').pop();
 							} else { //or the domain
-								localName=(localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.','');
+								localName = (localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.', '');
 							}
-							localName = getUniqueName(localName);
+							localName = FileList.getUniqueName(localName);
 							//IE < 10 does not fire the necessary events for the progress bar.
 							if ($('html.lte9').length === 0) {
-								$('#uploadprogressbar').progressbar({value:0});
+								$('#uploadprogressbar').progressbar({value: 0});
 								$('#uploadprogressbar').fadeIn();
 							}
 
-							var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
-							eventSource.listen('progress',function(progress) {
+							var eventSource = new OC.EventSource(
+								OC.filePath('files', 'ajax', 'newfile.php'),
+								{
+									dir: FileList.getCurrentDirectory(),
+									source: name,
+									filename: localName
+								}
+							);
+							eventSource.listen('progress', function(progress) {
 								//IE < 10 does not fire the necessary events for the progress bar.
 								if ($('html.lte9').length === 0) {
 									$('#uploadprogressbar').progressbar('value',progress);
 								}
 							});
-							eventSource.listen('success',function(data) {
+							eventSource.listen('success', function(data) {
 								var file = data;
 								$('#uploadprogressbar').fadeOut();
 
-								FileList.add(file, {hidden: hidden, insert: true});
+								FileList.add(file, {hidden: hidden, animate: true});
 							});
-							eventSource.listen('error',function(error) {
+							eventSource.listen('error', function(error) {
 								$('#uploadprogressbar').fadeOut();
 								var message = (error && error.message) || t('core', 'Error fetching URL');
 								OC.Notification.show(message);
@@ -670,12 +683,12 @@ OC.Upload = {
 							});
 							break;
 					}
-					var li=form.parent();
+					var li = form.parent();
 					form.remove();
 					/* workaround for IE 9&10 click event trap, 2 lines: */
 					$('input').first().focus();
 					$('#content').focus();
-					li.append('<p>'+li.data('text')+'</p>');
+					li.append('<p>' + li.data('text') + '</p>');
 					$('#new>a').click();
 				} catch (error) {
 					input.attr('title', error);
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index ecdfa72a47..b9cd9816d4 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -8,242 +8,255 @@
  *
  */
 
-/* global OC, FileList, Files */
 /* global trashBinApp */
-var FileActions = {
-	actions: {},
-	defaults: {},
-	icons: {},
-	currentFile: null,
-	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);
-		}
-		if (type) {//type is 'dir' or 'file'
-			if (FileActions.actions[type]) {
-				actions = $.extend(actions, FileActions.actions[type]);
+(function() {
+
+	var FileActions = {
+		actions: {},
+		defaults: {},
+		icons: {},
+		currentFile: null,
+		register: function (mime, name, permissions, icon, action, displayName) {
+			if (!this.actions[mime]) {
+				this.actions[mime] = {};
 			}
-		}
-		if (mime) {
-			var mimePart = mime.substr(0, mime.indexOf('/'));
-			if (FileActions.actions[mimePart]) {
-				actions = $.extend(actions, FileActions.actions[mimePart]);
+			if (!this.actions[mime][name]) {
+				this.actions[mime][name] = {};
 			}
-			if (FileActions.actions[mime]) {
-				actions = $.extend(actions, FileActions.actions[mime]);
+			if (!displayName) {
+				displayName = t('files', name);
 			}
-		}
-		var filteredActions = {};
-		$.each(actions, function (name, action) {
-			if (action.permissions & permissions) {
-				filteredActions[name] = action;
+			this.actions[mime][name]['action'] = action;
+			this.actions[mime][name]['permissions'] = permissions;
+			this.actions[mime][name]['displayName'] = displayName;
+			this.icons[name] = icon;
+		},
+		clear: function() {
+			this.actions = {};
+			this.defaults = {};
+			this.icons = {};
+			this.currentFile = null;
+		},
+		setDefault: function (mime, name) {
+			this.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 (this.actions.all) {
+				actions = $.extend(actions, this.actions.all);
 			}
-		});
-		return filteredActions;
-	},
-	getDefault: function (mime, type, permissions) {
-		var mimePart;
-		if (mime) {
-			mimePart = mime.substr(0, mime.indexOf('/'));
-		}
-		var name = false;
-		if (mime && FileActions.defaults[mime]) {
-			name = FileActions.defaults[mime];
-		} else if (mime && FileActions.defaults[mimePart]) {
-			name = FileActions.defaults[mimePart];
-		} else if (type && FileActions.defaults[type]) {
-			name = FileActions.defaults[type];
-		} else {
-			name = FileActions.defaults.all;
-		}
-		var actions = this.get(mime, type, permissions);
-		return actions[name];
-	},
-	/**
-	 * Display file actions for the given element
-	 * @param parent "td" element of the file for which to display actions
-	 * @param triggerEvent if true, triggers the fileActionsReady on the file
-	 * list afterwards (false by default)
-	 */
-	display: function (parent, triggerEvent) {
-		FileActions.currentFile = parent;
-		var actions = FileActions.getActions(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
-		var file = FileActions.getCurrentFile();
-		var nameLinks;
-		if (FileList.findFileEl(file).data('renaming')) {
-			return;
-		}
-
-		// recreate fileactions
-		nameLinks = parent.children('a.name');
-		nameLinks.find('.fileactions, .nametext .action').remove();
-		nameLinks.append('<span class="fileactions" />');
-		var defaultAction = FileActions.getDefault(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
-
-		var actionHandler = function (event) {
-			event.stopPropagation();
-			event.preventDefault();
-
-			FileActions.currentFile = event.data.elem;
-			var file = FileActions.getCurrentFile();
-
-			event.data.actionFunc(file);
-		};
-
-		var addAction = function (name, action, displayName) {
-
-			if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') {
-
-				var img = FileActions.icons[name],
-					actionText = displayName,
-					actionContainer = 'a.name>span.fileactions';
-
-				if (name === 'Rename') {
-					// rename has only an icon which appears behind
-					// the file name
-					actionText = '';
-					actionContainer = 'a.name span.nametext';
+			if (type) {//type is 'dir' or 'file'
+				if (this.actions[type]) {
+					actions = $.extend(actions, this.actions[type]);
 				}
+			}
+			if (mime) {
+				var mimePart = mime.substr(0, mime.indexOf('/'));
+				if (this.actions[mimePart]) {
+					actions = $.extend(actions, this.actions[mimePart]);
+				}
+				if (this.actions[mime]) {
+					actions = $.extend(actions, this.actions[mime]);
+				}
+			}
+			var filteredActions = {};
+			$.each(actions, function (name, action) {
+				if (action.permissions & permissions) {
+					filteredActions[name] = action;
+				}
+			});
+			return filteredActions;
+		},
+		getDefault: function (mime, type, permissions) {
+			var mimePart;
+			if (mime) {
+				mimePart = mime.substr(0, mime.indexOf('/'));
+			}
+			var name = false;
+			if (mime && this.defaults[mime]) {
+				name = this.defaults[mime];
+			} else if (mime && this.defaults[mimePart]) {
+				name = this.defaults[mimePart];
+			} else if (type && this.defaults[type]) {
+				name = this.defaults[type];
+			} else {
+				name = this.defaults.all;
+			}
+			var actions = this.get(mime, type, permissions);
+			return actions[name];
+		},
+		/**
+		 * Display file actions for the given element
+		 * @param parent "td" element of the file for which to display actions
+		 * @param triggerEvent if true, triggers the fileActionsReady on the file
+		 * list afterwards (false by default)
+		 */
+		display: function (parent, triggerEvent) {
+			this.currentFile = parent;
+			var self = this;
+			var actions = this.getActions(this.getCurrentMimeType(), this.getCurrentType(), this.getCurrentPermissions());
+			var file = this.getCurrentFile();
+			var nameLinks;
+			if (parent.closest('tr').data('renaming')) {
+				return;
+			}
+
+			// recreate fileactions
+			nameLinks = parent.children('a.name');
+			nameLinks.find('.fileactions, .nametext .action').remove();
+			nameLinks.append('<span class="fileactions" />');
+			var defaultAction = this.getDefault(this.getCurrentMimeType(), this.getCurrentType(), this.getCurrentPermissions());
+
+			var actionHandler = function (event) {
+				event.stopPropagation();
+				event.preventDefault();
+
+				self.currentFile = event.data.elem;
+				var file = self.getCurrentFile();
+
+				event.data.actionFunc(file);
+			};
+
+			var addAction = function (name, action, displayName) {
+
+				if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') {
+
+					var img = self.icons[name],
+						actionText = displayName,
+						actionContainer = 'a.name>span.fileactions';
+
+					if (name === 'Rename') {
+						// rename has only an icon which appears behind
+						// the file name
+						actionText = '';
+						actionContainer = 'a.name span.nametext';
+					}
+					if (img.call) {
+						img = img(file);
+					}
+					var html = '<a href="#" class="action action-' + name.toLowerCase() + '" data-action="' + name + '">';
+					if (img) {
+						html += '<img class ="svg" src="' + img + '" />';
+					}
+					html += '<span> ' + actionText + '</span></a>';
+
+					var element = $(html);
+					element.data('action', name);
+					element.on('click', {a: null, elem: parent, actionFunc: actions[name].action}, actionHandler);
+					parent.find(actionContainer).append(element);
+				}
+
+			};
+
+			$.each(actions, function (name, action) {
+				if (name !== 'Share') {
+					displayName = action.displayName;
+					ah = action.action;
+
+					addAction(name, ah, displayName);
+				}
+			});
+			if(actions.Share){
+				displayName = t('files', 'Share');
+				addAction('Share', actions.Share, displayName);
+			}
+
+			// remove the existing delete action
+			parent.parent().children().last().find('.action.delete').remove();
+			if (actions['Delete']) {
+				var img = self.icons['Delete'];
+				var html;
 				if (img.call) {
 					img = img(file);
 				}
-				var html = '<a href="#" class="action action-' + name.toLowerCase() + '" data-action="' + name + '">';
-				if (img) {
-					html += '<img class ="svg" src="' + img + '" />';
+				if (typeof trashBinApp !== 'undefined' && trashBinApp) {
+					html = '<a href="#" original-title="' + t('files', 'Delete permanently') + '" class="action delete delete-icon" />';
+				} else {
+					html = '<a href="#" class="action delete delete-icon" />';
 				}
-				html += '<span> ' + actionText + '</span></a>';
-
 				var element = $(html);
-				element.data('action', name);
-				element.on('click', {a: null, elem: parent, actionFunc: actions[name].action}, actionHandler);
-				parent.find(actionContainer).append(element);
+				element.data('action', actions['Delete']);
+				element.on('click', {a: null, elem: parent, actionFunc: actions['Delete'].action}, actionHandler);
+				parent.parent().children().last().append(element);
 			}
 
-		};
-
-		$.each(actions, function (name, action) {
-			if (name !== 'Share') {
-				displayName = action.displayName;
-				ah = action.action;
-
-				addAction(name, ah, displayName);
+			if (triggerEvent){
+				$('#fileList').trigger(jQuery.Event("fileActionsReady"));
 			}
-		});
-		if(actions.Share){
-			displayName = t('files', 'Share');
-			addAction('Share', actions.Share, displayName);
-		}
+		},
+		getCurrentFile: function () {
+			return this.currentFile.parent().attr('data-file');
+		},
+		getCurrentMimeType: function () {
+			return this.currentFile.parent().attr('data-mime');
+		},
+		getCurrentType: function () {
+			return this.currentFile.parent().attr('data-type');
+		},
+		getCurrentPermissions: function () {
+			return this.currentFile.parent().data('permissions');
+		},
 
-		// remove the existing delete action
-		parent.parent().children().last().find('.action.delete').remove();
-		if (actions['Delete']) {
-			var img = FileActions.icons['Delete'];
-			var html;
-			if (img.call) {
-				img = img(file);
-			}
-			if (typeof trashBinApp !== 'undefined' && trashBinApp) {
-				html = '<a href="#" original-title="' + t('files', 'Delete permanently') + '" class="action delete delete-icon" />';
+		/**
+		 * Register the actions that are used by default for the files app.
+		 */
+		registerDefaultActions: function(fileList) {
+			// TODO: try to find a way to not make it depend on fileList,
+			// maybe get a handler or listener to trigger events on
+			this.register('all', 'Delete', OC.PERMISSION_DELETE, function () {
+				return OC.imagePath('core', 'actions/delete');
+			}, function (filename) {
+				fileList.do_delete(filename);
+				$('.tipsy').remove();
+			});
+
+			// t('files', 'Rename')
+			this.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
+				return OC.imagePath('core', 'actions/rename');
+			}, function (filename) {
+				fileList.rename(filename);
+			});
+
+			this.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
+				var dir = fileList.getCurrentDirectory();
+				if (dir !== '/') {
+					dir = dir + '/';
+				}
+				fileList.changeDirectory(dir + filename);
+			});
+
+			this.setDefault('dir', 'Open');
+			var downloadScope;
+			if ($('#allowZipDownload').val() == 1) {
+				downloadScope = 'all';
 			} else {
-				html = '<a href="#" class="action delete delete-icon" />';
+				downloadScope = 'file';
 			}
-			var element = $(html);
-			element.data('action', actions['Delete']);
-			element.on('click', {a: null, elem: parent, actionFunc: actions['Delete'].action}, actionHandler);
-			parent.parent().children().last().append(element);
+
+			this.register(downloadScope, 'Download', OC.PERMISSION_READ, function () {
+				return OC.imagePath('core', 'actions/download');
+			}, function (filename) {
+				var url = OCA.Files.Files.getDownloadUrl(filename, fileList.getCurrentDirectory());
+				if (url) {
+					OC.redirect(url);
+				}
+			});
+
+			fileList.$fileList.trigger(jQuery.Event("fileActionsReady"));
 		}
+	};
 
-		if (triggerEvent){
-			$('#fileList').trigger(jQuery.Event("fileActionsReady"));
-		}
-	},
-	getCurrentFile: function () {
-		return FileActions.currentFile.parent().attr('data-file');
-	},
-	getCurrentMimeType: function () {
-		return FileActions.currentFile.parent().attr('data-mime');
-	},
-	getCurrentType: function () {
-		return FileActions.currentFile.parent().attr('data-type');
-	},
-	getCurrentPermissions: function () {
-		return FileActions.currentFile.parent().data('permissions');
-	}
-};
+	OCA.Files.FileActions = FileActions;
+})();
 
-$(document).ready(function () {
-	var downloadScope;
-	if ($('#allowZipDownload').val() == 1) {
-		downloadScope = 'all';
-	} else {
-		downloadScope = 'file';
-	}
+// for backward compatibility
+window.FileActions = OCA.Files.FileActions;
 
-	if (typeof disableDownloadActions == 'undefined' || !disableDownloadActions) {
-		FileActions.register(downloadScope, 'Download', OC.PERMISSION_READ, function () {
-			return OC.imagePath('core', 'actions/download');
-		}, function (filename) {
-			var url = Files.getDownloadUrl(filename);
-			if (url) {
-				OC.redirect(url);
-			}
-		});
-	}
-	$('#fileList tr').each(function () {
-		FileActions.display($(this).children('td.filename'));
-	});
-
-	$('#fileList').trigger(jQuery.Event("fileActionsReady"));
-
-});
-
-FileActions.register('all', 'Delete', OC.PERMISSION_DELETE, function () {
-	return OC.imagePath('core', 'actions/delete');
-}, function (filename) {
-	FileList.do_delete(filename);
-	$('.tipsy').remove();
-});
-
-// t('files', 'Rename')
-FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
-	return OC.imagePath('core', 'actions/rename');
-}, function (filename) {
-	FileList.rename(filename);
-});
-
-FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
-	var dir = $('#dir').val() || '/';
-	if (dir !== '/') {
-		dir = dir + '/';
-	}
-	FileList.changeDirectory(dir + filename);
-});
-
-FileActions.setDefault('dir', 'Open');
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index c33b638b5a..38766e2b80 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -8,1259 +8,1770 @@
  *
  */
 
-/* global OC, t, n, FileList, FileActions, Files, BreadCrumb */
-/* global procesSelection, dragOptions, folderDropOptions */
-window.FileList = {
-	appName: t('files', 'Files'),
-	isEmpty: true,
-	useUndo:true,
-	$el: $('#filestable'),
-	$fileList: $('#fileList'),
-	breadcrumb: null,
-	initialized: false,
-
+(function() {
 	/**
-	 * Initialize the file list and its components
+	 * The FileList class manages a file list view.
+	 * A file list view consists of a controls bar and
+	 * a file list table.
 	 */
-	initialize: function() {
-		var self = this;
-		if (this.initialized) {
-			return;
-		}
+	var FileList = function($el, options) {
+		this.initialize($el, options);
+	};
+	FileList.prototype = {
+		SORT_INDICATOR_ASC_CLASS: 'icon-triangle-s',
+		SORT_INDICATOR_DESC_CLASS: 'icon-triangle-n',
 
-		// TODO: FileList should not know about global elements
-		this.$el = $('#filestable');
-		this.$fileList = $('#fileList');
+		id: 'files',
+		appName: t('files', 'Files'),
+		isEmpty: true,
+		useUndo:true,
 
-		this.breadcrumb = new BreadCrumb({
-			onClick: this._onClickBreadCrumb,
-			onDrop: this._onDropOnBreadCrumb,
-			getCrumbUrl: function(part, index) {
-				return self.linkTo(part.dir);
+		/**
+		 * Top-level container with controls and file list
+		 */
+		$el: null,
+
+		/**
+		 * Files table
+		 */
+		$table: null,
+
+		/**
+		 * List of rows (table tbody)
+		 */
+		$fileList: null,
+
+		breadcrumb: null,
+
+		/**
+		 * Instance of FileSummary
+		 */
+		fileSummary: null,
+		initialized: false,
+
+		// number of files per page
+		pageSize: 20,
+
+		/**
+		 * Array of files in the current folder.
+		 * The entries are of file data.
+		 */
+		files: [],
+
+		/**
+		 * File actions handler, defaults to OCA.Files.FileActions
+		 */
+		fileActions: null,
+
+		/**
+		 * Map of file id to file data
+		 */
+		_selectedFiles: {},
+
+		/**
+		 * Summary of selected files.
+		 * Instance of FileSummary.
+		 */
+		_selectionSummary: null,
+
+		/**
+		 * Sort attribute
+		 */
+		_sort: 'name',
+
+		/**
+		 * Sort direction: 'asc' or 'desc'
+		 */
+		_sortDirection: 'asc',
+
+		/**
+		 * Sort comparator function for the current sort
+		 */
+		_sortComparator: null,
+
+		/**
+		 * Current directory
+		 */
+		_currentDirectory: null,
+
+		_dragOptions: null,
+		_folderDropOptions: null,
+
+		/**
+		 * Initialize the file list and its components
+		 *
+		 * @param $el container element with existing markup for the #controls
+		 * and a table
+		 * @param options map of options, see other parameters
+		 * @param scrollContainer scrollable container, defaults to $(window)
+		 * @param dragOptions drag options, disabled by default
+		 * @param folderDropOptions folder drop options, disabled by default
+		 */
+		initialize: function($el, options) {
+			var self = this;
+			options = options || {};
+			if (this.initialized) {
+				return;
 			}
-		});
 
-		$('#controls').prepend(this.breadcrumb.$el);
+			if (options.dragOptions) {
+				this._dragOptions = options.dragOptions;
+			}
+			if (options.folderDropOptions) {
+				this._folderDropOptions = options.folderDropOptions;
+			}
 
-		$(window).resize(function() {
-			// TODO: debounce this ?
-			var width = $(this).width();
-			FileList.breadcrumb.resize(width, false);
-		});
-	},
+			this.$el = $el;
+			this.$container = options.scrollContainer || $(window);
+			this.$table = $el.find('table:first');
+			this.$fileList = $el.find('#fileList');
+			this.fileActions = OCA.Files.FileActions;
+			this.files = [];
+			this._selectedFiles = {};
+			this._selectionSummary = new OCA.Files.FileSummary();
 
-	/**
-	 * Event handler when clicking on a bread crumb
-	 */
-	_onClickBreadCrumb: function(e) {
-		var $el = $(e.target).closest('.crumb'),
-			$targetDir = $el.data('dir');
+			this.fileSummary = this._createSummary();
 
-		if ($targetDir !== undefined) {
-			e.preventDefault();
-			FileList.changeDirectory($targetDir);
-		}
-	},
+			this.setSort('name', 'asc');
 
-	/**
-	 * 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'));
+			var breadcrumbOptions = {
+				onClick: _.bind(this._onClickBreadCrumb, this),
+				getCrumbUrl: function(part) {
+					return self.linkTo(part.dir);
 				}
-				td.css('background-image', oldBackgroundImage);
+			};
+			// if dropping on folders is allowed, then also allow on breadcrumbs
+			if (this._folderDropOptions) {
+				breadcrumbOptions.onDrop = _.bind(this._onDropOnBreadCrumb, this);
+			}
+			this.breadcrumb = new OCA.Files.BreadCrumb(breadcrumbOptions);
+
+			this.$el.find('#controls').prepend(this.breadcrumb.$el);
+
+			this.$el.find('thead th .columntitle').click(_.bind(this._onClickHeader, this));
+
+			$(window).resize(function() {
+				// TODO: debounce this ?
+				var width = $(this).width();
+				self.breadcrumb.resize(width, false);
 			});
-		});
-	},
 
-	/**
-	 * Sets a new page title
-	 */
-	setPageTitle: function(title){
-		if (title) {
-			title += ' - ';
-		} else {
-			title = '';
-		}
-		title += FileList.appName;
-		// Sets the page title with the " - ownCloud" suffix as in templates
-		window.document.title = title + ' - ' + oc_defaults.title;
+			this.$fileList.on('click','td.filename>a.name', _.bind(this._onClickFile, this));
+			this.$fileList.on('change', 'td.filename>input:checkbox', _.bind(this._onClickFileCheckbox, this));
+			this.$el.on('urlChanged', _.bind(this._onUrlChanged, this));
+			this.$el.find('.select-all').click(_.bind(this._onClickSelectAll, this));
+			this.$el.find('.download').click(_.bind(this._onClickDownloadSelected, this));
+			this.$el.find('.delete-selected').click(_.bind(this._onClickDeleteSelected, this));
 
-		return true;
-	},
-	/**
-	 * Returns the tr element for a given file name
-	 * @param fileName file name
-	 */
-	findFileEl: function(fileName){
-		// use filterAttr to avoid escaping issues
-		return this.$fileList.find('tr').filterAttr('data-file', fileName);
-	},
-	/**
-	 * 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.setupUploadEvents();
 
-		this.$fileList.empty();
+			this.$container.on('scroll', _.bind(this._onScroll, this));
+		},
 
-		this.isEmpty = filesArray.length === 0;
-		for (var i = 0; i < filesArray.length; i++) {
-			this.add(filesArray[i], {updateSummary: false});
-		}
+		/**
+		 * Event handler for when the URL changed
+		 */
+		_onUrlChanged: function(e) {
+			if (e && e.dir) {
+				this.changeDirectory(e.dir, false, true);
+			}
+		},
 
-		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();
-		}
-		this.updateFileSummary();
-		procesSelection();
-		$(window).scrollTop(0);
-
-		this.$fileList.trigger(jQuery.Event("updated"));
-	},
-	/**
-	 * 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';
-		}
-
-		// user should always be able to rename a share mount point
-		var allowRename = 0;
-		if (fileData.isShareMountPoint) {
-			allowRename = OC.PERMISSION_UPDATE;
-		}
-
-		//containing tr
-		var tr = $('<tr></tr>').attr({
-			"data-id" : fileData.id,
-			"data-type": type,
-			"data-size": fileData.size,
-			"data-file": name,
-			"data-mime": mime,
-			"data-mtime": mtime,
-			"data-etag": fileData.etag,
-			"data-permissions": fileData.permissions | allowRename || 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(' + icon + '); background-size: 32px;'
-		});
-
-		// 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 linkElem = $('<a></a>').attr({
-			"class": "name",
-			"href": linkUrl
-		});
-
-		// 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('.'));
-		} else {
-			basename = name;
-			extension = false;
-		}
-		var nameSpan=$('<span></span>').addClass('nametext').text(basename);
-		linkElem.append(nameSpan);
-		if (extension) {
-			nameSpan.append($('<span></span>').addClass('extension').text(extension));
-		}
-		// dirs can show the number of uploaded files
-		if (type === 'dir') {
-			linkElem.append($('<span></span>').attr({
-				'class': 'uploadtext',
-				'currentUploads': 0
-			}));
-		}
-		td.append(linkElem);
-		tr.append(td);
-
-		// 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');
-		}
-
-		td = $('<td></td>').attr({
-			"class": "filesize",
-			"style": 'color:rgb(' + sizeColor + ',' + sizeColor + ',' + sizeColor + ')'
-		}).text(simpleSize);
-		tr.append(td);
-
-		// date column
-		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(mtime),
-			"style": 'color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')'
-		}).text( relative_modified_date(mtime / 1000) ));
-		tr.find('.filesize').text(simpleSize);
-		tr.append(td);
-		return tr;
-	},
-	/**
-	 * 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 (fileData.isShareMountPoint) {
-			permissions = permissions | OC.PERMISSION_UPDATE;
-		}
-
-		if (type === 'dir') {
-			mime = mime || 'httpd/unix-directory';
-		}
-		var tr = this._createRow(
-			fileData,
-			options
-		);
-		var filenameTd = tr.find('td.filename');
-
-		// 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;
-
-		// 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);
-		}
-
-		if (options.hidden) {
-			tr.addClass('hidden');
-		}
-
-		// 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);
+		/**
+		 * Selected/deselects the given file element and updated
+		 * the internal selection cache.
+		 *
+		 * @param $tr single file row element
+		 * @param state true to select, false to deselect
+		 */
+		_selectFileEl: function($tr, state) {
+			var $checkbox = $tr.find('td.filename>input:checkbox');
+			var oldData = !!this._selectedFiles[$tr.data('id')];
+			var data;
+			$checkbox.prop('checked', state);
+			$tr.toggleClass('selected', state);
+			// already selected ?
+			if (state === oldData) {
+				return;
+			}
+			data = this.elementToFile($tr);
+			if (state) {
+				this._selectedFiles[$tr.data('id')] = data;
+				this._selectionSummary.add(data);
 			}
 			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 + ')');
+				delete this._selectedFiles[$tr.data('id')];
+				this._selectionSummary.remove(data);
 			}
-		}
+			this.$el.find('.select-all').prop('checked', this._selectionSummary.getTotal() === this.files.length);
+		},
 
-		// defaults to true if not defined
-		if (typeof(options.updateSummary) === 'undefined' || !!options.updateSummary) {
-			this.updateFileSummary();
-			this.updateEmptyContent();
-		}
-		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)
-	 * @param {boolean} force set to true to force changing directory
-	 */
-	changeDirectory: function(targetDir, changeUrl, force) {
-		var $dir = $('#dir'),
-			url,
-			currentDir = $dir.val() || '/';
-		targetDir = targetDir || '/';
-		if (!force && currentDir === targetDir) {
-			return;
-		}
-		FileList._setCurrentDir(targetDir, changeUrl);
-		$('#fileList').trigger(
-			jQuery.Event('changeDirectory', {
-				dir: targetDir,
-				previousDir: currentDir
-			}
-		));
-		FileList.reload();
-	},
-	linkTo: function(dir) {
-		return OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
-	},
+		/**
+		 * Event handler for when clicking on files to select them
+		 */
+		_onClickFile: function(event) {
+			var $tr = $(event.target).closest('tr');
+			if (event.ctrlKey || event.shiftKey) {
+				event.preventDefault();
+				if (event.shiftKey) {
+					var $lastTr = $(this._lastChecked);
+					var lastIndex = $lastTr.index();
+					var currentIndex = $tr.index();
+					var $rows = this.$fileList.children('tr');
 
-	/**
-	 * 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);
+					// last clicked checkbox below current one ?
+					if (lastIndex > currentIndex) {
+						var aux = lastIndex;
+						lastIndex = currentIndex;
+						currentIndex = aux;
+					}
 
-		if (baseDir !== '') {
-			FileList.setPageTitle(baseDir);
-		}
-		else {
-			FileList.setPageTitle();
-		}
-
-		$('#dir').val(targetDir);
-		if (changeUrl !== false) {
-			if (window.history.pushState && changeUrl !== false) {
-				url = FileList.linkTo(targetDir);
-				window.history.pushState({dir: targetDir}, '', url);
-			}
-			// use URL hash for IE8
-			else{
-				window.location.hash = '?dir='+ encodeURIComponent(targetDir).replace(/%2F/g, '/');
-			}
-		}
-		this.breadcrumb.setDirectory(this.getCurrentDirectory());
-	},
-	/**
-	 * @brief Reloads the file list using ajax call
-	 */
-	reload: function() {
-		FileList.showMask();
-		if (FileList._reloadCall) {
-			FileList._reloadCall.abort();
-		}
-		FileList._reloadCall = $.ajax({
-			url: Files.getAjaxUrl('list'),
-			data: {
-				dir : $('#dir').val()
-			},
-			error: function(result) {
-				FileList.reloadCallback(result);
-			},
-			success: function(result) {
-				FileList.reloadCallback(result);
-			}
-		});
-	},
-	reloadCallback: function(result) {
-		delete this._reloadCall;
-		this.hideMask();
-
-		if (!result || result.status === 'error') {
-			OC.Notification.show(result.data.message);
-			return;
-		}
-
-		if (result.status === 404) {
-			// go back home
-			this.changeDirectory('/');
-			return;
-		}
-		// aborted ?
-		if (result.status === 0){
-			return;
-		}
-
-		// TODO: should rather return upload file size through
-		// the files list ajax call
-		Files.updateStorageStatistics(true);
-
-		if (result.data.permissions) {
-			this.setDirectoryPermissions(result.data.permissions);
-		}
-
-		this.setFiles(result.data.files);
-	},
-	setDirectoryPermissions: function(permissions) {
-		var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
-		$('#permissions').val(permissions);
-		$('.creatable').toggleClass('hidden', !isCreatable);
-		$('.notCreatable').toggleClass('hidden', isCreatable);
-	},
-	/**
-	 * Shows/hides action buttons
-	 *
-	 * @param show true for enabling, false for disabling
-	 */
-	showActions: function(show){
-		$('.actions,#file_action_panel').toggleClass('hidden', !show);
-		if (show){
-			// make sure to display according to permissions
-			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');
-		}
-	},
-	/**
-	 * Enables/disables viewer mode.
-	 * In viewer mode, apps can embed themselves under the controls bar.
-	 * In viewer mode, the actions of the file list will be hidden.
-	 * @param show true for enabling, false for disabling
-	 */
-	setViewerMode: function(show){
-		this.showActions(!show);
-		$('#filestable').toggleClass('hidden', show);
-	},
-	/**
-	 * 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();
-		// 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 = 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) {
-			pos = fileElements.length - 1;
-		} else {
-			for(pos = 0; pos<fileElements.length-1; pos++) {
-				if (name.localeCompare($(fileElements[pos]).attr('data-file')) > 0
-					&& name.localeCompare($(fileElements[pos+1]).attr('data-file')) < 0)
-				{
-					break;
+					// auto-select everything in-between
+					for (var i = lastIndex + 1; i < currentIndex; i++) {
+						this._selectFileEl($rows.eq(i), true);
+					}
 				}
-			}
-		}
-		if (fileElements.exists()) {
-			if (pos === -1) {
-				$(fileElements[0]).before(element);
+				else {
+					this._lastChecked = $tr;
+				}
+				var $checkbox = $tr.find('td.filename>input:checkbox');
+				this._selectFileEl($tr, !$checkbox.prop('checked'));
+				this.updateSelectionSummary();
 			} else {
-				$(fileElements[pos]).after(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 {
-			this.$fileList.append(element);
-		}
-		FileList.isEmpty = false;
-		FileList.updateEmptyContent();
-		FileList.updateFileSummary();
-	},
-	rename: function(oldname) {
-		var tr, td, input, form;
-		tr = FileList.findFileEl(oldname);
-		tr.data('renaming',true);
-		td = tr.children('td.filename');
-		input = $('<input type="text" class="filename"/>').val(oldname);
-		form = $('<form></form>');
-		form.append(input);
-		td.children('a.name').hide();
-		td.append(form);
-		input.focus();
-		//preselect input
-		var len = input.val().lastIndexOf('.');
-		if ( len === -1 ||
-			tr.data('type') === 'dir' ) {
-			len = input.val().length;
-		}
-		input.selectRange(0, len);
-		var checkInput = function () {
-			var filename = input.val();
-			if (filename !== oldname) {
-				// Files.isFileNameValid(filename) throws an exception itself
-				Files.isFileNameValid(filename);
-				if (FileList.inList(filename)) {
-					throw t('files', '{new_name} already exists', {new_name: filename});
+				var filename = $tr.attr('data-file');
+				var renaming = $tr.data('renaming');
+				if (!renaming) {
+					this.fileActions.currentFile = $tr.find('td');
+					var mime = this.fileActions.getCurrentMimeType();
+					var type = this.fileActions.getCurrentType();
+					var permissions = this.fileActions.getCurrentPermissions();
+					var action = this.fileActions.getDefault(mime,type, permissions);
+					if (action) {
+						event.preventDefault();
+						action(filename);
+					}
 				}
 			}
-			return true;
-		};
+		},
 
-		form.submit(function(event) {
-			event.stopPropagation();
+		/**
+		 * Event handler for when clicking on a file's checkbox
+		 */
+		_onClickFileCheckbox: function(e) {
+			var $tr = $(e.target).closest('tr');
+			this._selectFileEl($tr, !$tr.hasClass('selected'));
+			this._lastChecked = $tr;
+			this.updateSelectionSummary();
+		},
+
+		/**
+		 * Event handler for when selecting/deselecting all files
+		 */
+		_onClickSelectAll: function(e) {
+			var checked = $(e.target).prop('checked');
+			this.$fileList.find('td.filename>input:checkbox').prop('checked', checked)
+				.closest('tr').toggleClass('selected', checked);
+			this._selectedFiles = {};
+			this._selectionSummary.clear();
+			if (checked) {
+				for (var i = 0; i < this.files.length; i++) {
+					var fileData = this.files[i];
+					this._selectedFiles[fileData.id] = fileData;
+					this._selectionSummary.add(fileData);
+				}
+			}
+			this.updateSelectionSummary();
+		},
+
+		/**
+		 * Event handler for when clicking on "Download" for the selected files
+		 */
+		_onClickDownloadSelected: function(event) {
+			var files;
+			var dir = this.getCurrentDirectory();
+			if (this.isAllSelected()) {
+				files = OC.basename(dir);
+				dir = OC.dirname(dir) || '/';
+			}
+			else {
+				files = _.pluck(this.getSelectedFiles(), 'name');
+			}
+			OC.Notification.show(t('files','Your download is being prepared. This might take some time if the files are big.'));
+			OC.redirect(this.getDownloadUrl(files, dir));
+			return false;
+		},
+
+		/**
+		 * Event handler for when clicking on "Delete" for the selected files
+		 */
+		_onClickDeleteSelected: function(event) {
+			var files = null;
+			if (!this.isAllSelected()) {
+				files = _.pluck(this.getSelectedFiles(), 'name');
+			}
+			this.do_delete(files);
 			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
-					var oldBackgroundImage = td.css('background-image');
-					// mark as loading
-					td.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
-					$.ajax({
-						url: OC.filePath('files','ajax','rename.php'),
-						data: {
-							dir : $('#dir').val(),
-							newname: newname,
-							file: oldname
-						},
-						success: function(result) {
-							if (!result || result.status === 'error') {
-								OC.dialogs.alert(result.data.message, t('core', 'Could not rename file'));
-								// revert changes
-								newname = oldname;
-								tr.attr('data-file', 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 && tr.data('type') !== 'dir') {
-									basename = newname.substr(0,newname.lastIndexOf('.'));
-								}
-								td.find('a.name span.nametext').text(basename);
-								if (newname.indexOf('.') > 0 && tr.data('type') !== 'dir') {
-									if ( ! td.find('a.name span.extension').exists() ) {
-										td.find('a.name span.nametext').append('<span class="extension"></span>');
-									}
-									td.find('a.name span.extension').text(newname.substr(newname.lastIndexOf('.')));
-								}
-								tr.find('.fileactions').effect('highlight', {}, 5000);
-								tr.effect('highlight', {}, 5000);
-								// remove loading mark and recover old image
-								td.css('background-image', oldBackgroundImage);
-							}
-							else {
-								var fileInfo = result.data;
-								tr.attr('data-mime', fileInfo.mime);
-								tr.attr('data-etag', fileInfo.etag);
-								if (fileInfo.isPreviewAvailable) {
-									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('
-												+ OC.Util.replaceSVGIcon(fileInfo.icon)
-												+ ')');
-								}
-							}
-							// reinsert row
-							tr.detach();
-							FileList.insertElement( tr.attr('data-file'), tr.attr('data-type'),tr );
-							// update file actions in case the extension changed
-							FileActions.display( tr.find('td.filename'), true);
+			return false;
+		},
+
+		/**
+		 * Event handler when clicking on a table header
+		 */
+		_onClickHeader: function(e) {
+			var $target = $(e.target);
+			var sort;
+			if (!$target.is('a')) {
+				$target = $target.closest('a');
+			}
+			sort = $target.attr('data-sort');
+			if (sort) {
+				if (this._sort === sort) {
+					this.setSort(sort, (this._sortDirection === 'desc')?'asc':'desc');
+				}
+				else {
+					this.setSort(sort, 'asc');
+				}
+				this.reload();
+			}
+		},
+
+		/**
+		 * 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();
+				this.changeDirectory($targetDir);
+			}
+		},
+
+		/**
+		 * Event handler for when scrolling the list container.
+		 * This appends/renders the next page of entries when reaching the bottom.
+		 */
+		_onScroll: function(e) {
+			if (this.$container.scrollTop() + this.$container.height() > this.$el.height() - 100) {
+				this._nextPage(true);
+			}
+		},
+
+		/**
+		 * Event handler when dropping on a breadcrumb
+		 */
+		_onDropOnBreadCrumb: function( event, ui ) {
+			var $target = $(event.target);
+			if (!$target.is('.crumb')) {
+				$target = $target.closest('.crumb');
+			}
+			var targetPath = $(event.target).data('dir');
+			var dir = this.getCurrentDirectory();
+			while (dir.substr(0,1) === '/') {//remove extra leading /'s
+				dir = dir.substr(1);
+			}
+			dir = '/' + dir;
+			if (dir.substr(-1,1) !== '/') {
+				dir = dir + '/';
+			}
+			// do nothing if dragged on current dir
+			if (targetPath === dir || targetPath + '/' === dir) {
+				return;
+			}
+
+			var files = this.getSelectedFiles();
+			if (files.length === 0) {
+				// single one selected without checkbox?
+				files = _.map(ui.helper.find('tr'), this.elementToFile);
+			}
+
+			this.move(_.pluck(files, 'name'), targetPath);
+		},
+
+		/**
+		 * Sets a new page title
+		 */
+		setPageTitle: function(title){
+			if (title) {
+				title += ' - ';
+			} else {
+				title = '';
+			}
+			title += this.appName;
+			// Sets the page title with the " - ownCloud" suffix as in templates
+			window.document.title = title + ' - ' + oc_defaults.title;
+
+			return true;
+		},
+		/**
+		 * Returns the tr element for a given file name
+		 * @param fileName file name
+		 */
+		findFileEl: function(fileName){
+			// use filterAttr to avoid escaping issues
+			return this.$fileList.find('tr').filterAttr('data-file', fileName);
+		},
+
+		/**
+		 * Returns the file data from a given file element.
+		 * @param $el file tr element
+		 * @return file data
+		 */
+		elementToFile: function($el){
+			$el = $($el);
+			return {
+				id: parseInt($el.attr('data-id'), 10),
+				name: $el.attr('data-file'),
+				mimetype: $el.attr('data-mime'),
+				type: $el.attr('data-type'),
+				size: parseInt($el.attr('data-size'), 10),
+				etag: $el.attr('data-etag')
+			};
+		},
+
+		/**
+		 * Appends the next page of files into the table
+		 * @param animate true to animate the new elements
+		 */
+		_nextPage: function(animate) {
+			var index = this.$fileList.children().length,
+				count = this.pageSize,
+				tr,
+				fileData,
+				newTrs = [],
+				isAllSelected = this.isAllSelected();
+
+			if (index >= this.files.length) {
+				return;
+			}
+
+			while (count > 0 && index < this.files.length) {
+				fileData = this.files[index];
+				tr = this._renderRow(fileData, {updateSummary: false});
+				this.$fileList.append(tr);
+				if (isAllSelected || this._selectedFiles[fileData.id]) {
+					tr.addClass('selected');
+					tr.find('input:checkbox').prop('checked', true);
+				}
+				if (animate) {
+					tr.addClass('appear transparent');
+					newTrs.push(tr);
+				}
+				index++;
+				count--;
+			}
+
+			if (animate) {
+				// defer, for animation
+				window.setTimeout(function() {
+					for (var i = 0; i < newTrs.length; i++ ) {
+						newTrs[i].removeClass('transparent');
+					}
+				}, 0);
+			}
+		},
+
+		/**
+		 * Sets the files to be displayed in the list.
+		 * This operation will re-render the list and update the summary.
+		 * @param filesArray array of file data (map)
+		 */
+		setFiles: function(filesArray) {
+			// detach to make adding multiple rows faster
+			this.files = filesArray;
+
+			this.$fileList.detach();
+			this.$fileList.empty();
+
+			// clear "Select all" checkbox
+			this.$el.find('.select-all').prop('checked', false);
+
+			this.isEmpty = this.files.length === 0;
+			this._nextPage();
+
+			this.$el.find('thead').after(this.$fileList);
+
+			this.updateEmptyContent();
+			this.$fileList.trigger(jQuery.Event("fileActionsReady"));
+
+			this.fileSummary.calculate(filesArray);
+
+			this.updateSelectionSummary();
+			$(window).scrollTop(0);
+
+			this.$fileList.trigger(jQuery.Event("updated"));
+		},
+		/**
+		 * 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';
+			}
+
+			// user should always be able to rename a share mount point
+			var allowRename = 0;
+			if (fileData.isShareMountPoint) {
+				allowRename = OC.PERMISSION_UPDATE;
+			}
+
+			//containing tr
+			var tr = $('<tr></tr>').attr({
+				"data-id" : fileData.id,
+				"data-type": type,
+				"data-size": fileData.size,
+				"data-file": name,
+				"data-mime": mime,
+				"data-mtime": mtime,
+				"data-etag": fileData.etag,
+				"data-permissions": fileData.permissions | allowRename || 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(' + icon + '); background-size: 32px;'
+			});
+
+			// linkUrl
+			if (type === 'dir') {
+				linkUrl = this.linkTo(this.getCurrentDirectory() + '/' + name);
+			}
+			else {
+				linkUrl = this.getDownloadUrl(name, this.getCurrentDirectory());
+			}
+			td.append('<input id="select-' + this.id + '-' + fileData.id +
+				'" type="checkbox" /><label for="select-' + this.id + '-' + fileData.id + '"></label>');
+			var linkElem = $('<a></a>').attr({
+				"class": "name",
+				"href": linkUrl
+			});
+
+			// 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('.'));
+			} else {
+				basename = name;
+				extension = false;
+			}
+			var nameSpan=$('<span></span>').addClass('nametext').text(basename);
+			linkElem.append(nameSpan);
+			if (extension) {
+				nameSpan.append($('<span></span>').addClass('extension').text(extension));
+			}
+			// dirs can show the number of uploaded files
+			if (type === 'dir') {
+				linkElem.append($('<span></span>').attr({
+					'class': 'uploadtext',
+					'currentUploads': 0
+				}));
+			}
+			td.append(linkElem);
+			tr.append(td);
+
+			// 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');
+			}
+
+			td = $('<td></td>').attr({
+				"class": "filesize",
+				"style": 'color:rgb(' + sizeColor + ',' + sizeColor + ',' + sizeColor + ')'
+			}).text(simpleSize);
+			tr.append(td);
+
+			// date column
+			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(mtime),
+				"style": 'color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')'
+			}).text( relative_modified_date(mtime / 1000) ));
+			tr.find('.filesize').text(simpleSize);
+			tr.append(td);
+			return tr;
+		},
+
+		/**
+		 * Adds an entry to the files array and also into the DOM
+		 * in a sorted manner.
+		 *
+		 * @param fileData map of file attributes
+		 * @param options map of attributes:
+		 * - "updateSummary" true to update the summary after adding (default), false otherwise
+		 * @return new tr element (not appended to the table)
+		 */
+		add: function(fileData, options) {
+			var index = -1;
+			var $tr;
+			var $rows;
+			var $insertionPoint;
+			options = options || {};
+
+			// there are three situations to cover:
+			// 1) insertion point is visible on the current page
+			// 2) insertion point is on a not visible page (visible after scrolling)
+			// 3) insertion point is at the end of the list
+
+			$rows = this.$fileList.children();
+			index = this._findInsertionIndex(fileData);
+			if (index > this.files.length) {
+				index = this.files.length;
+			}
+			else {
+				$insertionPoint = $rows.eq(index);
+			}
+
+			// is the insertion point visible ?
+			if ($insertionPoint.length) {
+				// only render if it will really be inserted
+				$tr = this._renderRow(fileData, options);
+				$insertionPoint.before($tr);
+			}
+			else {
+				// if insertion point is after the last visible
+				// entry, append
+				if (index === $rows.length) {
+					$tr = this._renderRow(fileData, options);
+					this.$fileList.append($tr);
+				}
+			}
+
+			this.isEmpty = false;
+			this.files.splice(index, 0, fileData);
+
+			if ($tr && options.animate) {
+				$tr.addClass('appear transparent');
+				window.setTimeout(function() {
+					$tr.removeClass('transparent');
+				});
+			}
+
+			// defaults to true if not defined
+			if (typeof(options.updateSummary) === 'undefined' || !!options.updateSummary) {
+				this.fileSummary.add(fileData, true);
+				this.updateEmptyContent();
+			}
+
+			return $tr;
+		},
+
+		/**
+		 * Creates a new row element based on the given attributes
+		 * and returns it.
+		 *
+		 * @param fileData map of file attributes
+		 * @param options map of attributes:
+		 * - "index" optional index at which to insert the element
+		 * - "updateSummary" true to update the summary after adding (default), false otherwise
+		 * @return new tr element (not appended to the table)
+		 */
+		_renderRow: function(fileData, options) {
+			options = options || {};
+			var type = fileData.type || 'file',
+				mime = fileData.mimetype,
+				permissions = parseInt(fileData.permissions, 10) || 0;
+
+			if (fileData.isShareMountPoint) {
+				permissions = permissions | OC.PERMISSION_UPDATE;
+			}
+
+			if (type === 'dir') {
+				mime = mime || 'httpd/unix-directory';
+			}
+			var tr = this._createRow(
+				fileData,
+				options
+			);
+			var filenameTd = tr.find('td.filename');
+
+			// TODO: move dragging to FileActions ?
+			// enable drag only for deletable files
+			if (this._dragOptions && permissions & OC.PERMISSION_DELETE) {
+				filenameTd.draggable(this._dragOptions);
+			}
+			// allow dropping on folders
+			if (this._folderDropOptions && fileData.type === 'dir') {
+				filenameTd.droppable(this._folderDropOptions);
+			}
+
+			if (options.hidden) {
+				tr.addClass('hidden');
+			}
+
+			// display actions
+			this.fileActions.display(filenameTd, false);
+
+			if (fileData.isPreviewAvailable) {
+				// lazy load / newly inserted td ?
+				if (!fileData.icon) {
+					this.lazyLoadPreview({
+						path: this.getCurrentDirectory() + '/' + fileData.name,
+						mime: mime,
+						etag: fileData.etag,
+						callback: function(url) {
+							filenameTd.css('background-image', 'url(' + url + ')');
 						}
 					});
 				}
-				input.tipsy('hide');
-				tr.data('renaming',false);
-				tr.attr('data-file', newname);
-				var path = td.children('a.name').attr('href');
-				// FIXME this will fail if the path contains the filename.
-				td.children('a.name').attr('href', path.replace(encodeURIComponent(oldname), encodeURIComponent(newname)));
-				var basename = newname;
-				if (newname.indexOf('.') > 0 && tr.data('type') !== 'dir') {
-					basename = newname.substr(0, newname.lastIndexOf('.'));
+				else {
+					// set the preview URL directly
+					var urlSpec = {
+							file: this.getCurrentDirectory() + '/' + fileData.name,
+							c: fileData.etag
+						};
+					var previewUrl = this.generatePreviewUrl(urlSpec);
+					previewUrl = previewUrl.replace('(', '%28').replace(')', '%29');
+					filenameTd.css('background-image', 'url(' + previewUrl + ')');
 				}
-				td.find('a.name span.nametext').text(basename);
-				if (newname.indexOf('.') > 0 && tr.data('type') !== 'dir') {
-					if ( ! td.find('a.name span.extension').exists() ) {
-						td.find('a.name span.nametext').append('<span class="extension"></span>');
-					}
-					td.find('a.name span.extension').text(newname.substr(newname.lastIndexOf('.')));
+			}
+			return tr;
+		},
+		/**
+		 * Returns the current directory
+		 * @return current directory
+		 */
+		getCurrentDirectory: function(){
+			return this._currentDirectory || this.$el.find('#dir').val() || '/';
+		},
+		/**
+		 * Returns the directory permissions
+		 * @return permission value as integer
+		 */
+		getDirectoryPermissions: function() {
+			return parseInt(this.$el.find('#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)
+		 * @param {boolean} force set to true to force changing directory
+		 */
+		changeDirectory: function(targetDir, changeUrl, force) {
+			var currentDir = this.getCurrentDirectory();
+			targetDir = targetDir || '/';
+			if (!force && currentDir === targetDir) {
+				return;
+			}
+			this._setCurrentDir(targetDir, changeUrl);
+			this.reload();
+		},
+		linkTo: function(dir) {
+			return OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
+		},
+
+		/**
+		 * Sets the file actions handler
+		 */
+		setFileActions: function(fileActions) {
+			this.fileActions = fileActions;
+		},
+
+		/**
+		 * 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 previousDir = this.getCurrentDirectory(),
+				baseDir = OC.basename(targetDir);
+
+			if (baseDir !== '') {
+				this.setPageTitle(baseDir);
+			}
+			else {
+				this.setPageTitle();
+			}
+
+			this._currentDirectory = targetDir;
+
+			// legacy stuff
+			this.$el.find('#dir').val(targetDir);
+
+			if (changeUrl !== false) {
+				this.$el.trigger(jQuery.Event('changeDirectory', {
+					dir: targetDir,
+					previousDir: previousDir
+				}));
+			}
+			this.breadcrumb.setDirectory(this.getCurrentDirectory());
+		},
+		/**
+		 * Sets the current sorting and refreshes the list
+		 *
+		 * @param sort sort attribute name
+		 * @param direction sort direction, one of "asc" or "desc"
+		 */
+		setSort: function(sort, direction) {
+			var comparator = FileList.Comparators[sort] || FileList.Comparators.name;
+			this._sort = sort;
+			this._sortDirection = (direction === 'desc')?'desc':'asc';
+			this._sortComparator = comparator;
+			if (direction === 'desc') {
+				this._sortComparator = function(fileInfo1, fileInfo2) {
+					return -comparator(fileInfo1, fileInfo2);
+				};
+			}
+			this.$el.find('thead th .sort-indicator')
+				.removeClass(this.SORT_INDICATOR_ASC_CLASS + ' ' + this.SORT_INDICATOR_DESC_CLASS);
+			this.$el.find('thead th.column-' + sort + ' .sort-indicator')
+				.addClass(direction === 'desc' ? this.SORT_INDICATOR_DESC_CLASS : this.SORT_INDICATOR_ASC_CLASS);
+		},
+		/**
+		 * @brief Reloads the file list using ajax call
+		 */
+		reload: function() {
+			var self = this;
+			this._selectedFiles = {};
+			this._selectionSummary.clear();
+			this.$el.find('.select-all').prop('checked', false);
+			this.showMask();
+			if (this._reloadCall) {
+				this._reloadCall.abort();
+			}
+			this._reloadCall = $.ajax({
+				url: this.getAjaxUrl('list'),
+				data: {
+					dir : this.getCurrentDirectory(),
+					sort: this._sort,
+					sortdirection: this._sortDirection
+				},
+				error: function(result) {
+					self.reloadCallback(result);
+				},
+				success: function(result) {
+					self.reloadCallback(result);
 				}
-				form.remove();
-				FileActions.display( tr.find('td.filename'), true);
-				td.children('a.name').show();
-			} catch (error) {
-				input.attr('title', error);
-				input.tipsy({gravity: 'w', trigger: 'manual'});
-				input.tipsy('show');
-				input.addClass('error');
-			}
-			return false;
-		});
-		input.keyup(function(event) {
-			// verify filename on typing
-			try {
-				checkInput();
-				input.tipsy('hide');
-				input.removeClass('error');
-			} catch (error) {
-				input.attr('title', error);
-				input.tipsy({gravity: 'w', trigger: 'manual'});
-				input.tipsy('show');
-				input.addClass('error');
-			}
-			if (event.keyCode === 27) {
-				input.tipsy('hide');
-				tr.data('renaming',false);
-				form.remove();
-				td.children('a.name').show();
-			}
-		});
-		input.click(function(event) {
-			event.stopPropagation();
-			event.preventDefault();
-		});
-		input.blur(function() {
-			form.trigger('submit');
-		});
-	},
-	inList:function(file) {
-		return FileList.findFileEl(file).length;
-	},
-	/**
-	 * 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) {
-			files=[files];
-		}
-		if (files) {
-			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');
-			}
-		}
-		// Finish any existing actions
-		if (FileList.lastAction) {
-			FileList.lastAction();
-		}
-
-		params = {
-			dir: dir || FileList.getCurrentDirectory()
-		};
-		if (files) {
-			params.files = JSON.stringify(files);
-		}
-		else {
-			// no files passed, delete all in current dir
-			params.allfiles = true;
-		}
-
-		$.post(OC.filePath('files', 'ajax', 'delete.php'),
-				params,
-				function(result) {
-					if (result.status === 'success') {
-						if (params.allfiles) {
-							// clear whole list
-							$('#fileList tr').remove();
-						}
-						else {
-							$.each(files,function(index,file) {
-								var fileEl = FileList.remove(file, {updateSummary: false});
-								fileEl.find('input[type="checkbox"]').prop('checked', false);
-								fileEl.removeClass('selected');
-							});
-						}
-						procesSelection();
-						checkTrashStatus();
-						FileList.updateFileSummary();
-						FileList.updateEmptyContent();
-						Files.updateStorageStatistics();
-					} else {
-						if (result.status === 'error' && result.data.message) {
-							OC.Notification.show(result.data.message);
-						}
-						else {
-							OC.Notification.show(t('files', 'Error deleting file.'));
-						}
-						// hide notification after 10 sec
-						setTimeout(function() {
-							OC.Notification.hide();
-						}, 10000);
-						if (params.allfiles) {
-							// reload the page as we don't know what files were deleted
-							// and which ones remain
-							FileList.reload();
-						}
-						else {
-							$.each(files,function(index,file) {
-								var deleteAction = FileList.findFileEl(file).find('.action.delete');
-								deleteAction.removeClass('progress-icon').addClass('delete-icon');
-							});
-						}
-					}
-				});
-	},
-	createFileSummary: function() {
-		if ( !FileList.isEmpty ) {
-			var summary = this._calculateFileSummary();
-
-			// Get translations
-			var directoryInfo = n('files', '%n folder', '%n folders', summary.totalDirs);
-			var fileInfo = n('files', '%n file', '%n files', summary.totalFiles);
-
-			var infoVars = {
-				dirs: '<span class="dirinfo">'+directoryInfo+'</span><span class="connector">',
-				files: '</span><span class="fileinfo">'+fileInfo+'</span>'
-			};
-
-			var info = t('files', '{dirs} and {files}', infoVars);
-
-			// don't show the filesize column, if filesize is NaN (e.g. in trashbin)
-			var fileSize = '';
-			if (!isNaN(summary.totalSize)) {
-				fileSize = '<td class="filesize">'+humanFileSize(summary.totalSize)+'</td>';
-			}
-
-			var $summary = $('<tr class="summary" data-file="undefined"><td><span class="info">'+info+'</span></td>'+fileSize+'<td></td></tr>');
-			this.$fileList.append($summary);
-
-			var $dirInfo = $summary.find('.dirinfo');
-			var $fileInfo = $summary.find('.fileinfo');
-			var $connector = $summary.find('.connector');
-
-			// Show only what's necessary, e.g.: no files: don't show "0 files"
-			if (summary.totalDirs === 0) {
-				$dirInfo.addClass('hidden');
-				$connector.addClass('hidden');
-			}
-			if (summary.totalFiles === 0) {
-				$fileInfo.addClass('hidden');
-				$connector.addClass('hidden');
-			}
-		}
-	},
-	_calculateFileSummary: function() {
-		var result = {
-			totalDirs: 0,
-			totalFiles: 0,
-			totalSize: 0
-		};
-		$.each($('tr[data-file]'), function(index, value) {
-			var $value = $(value);
-			if ($value.data('type') === 'dir') {
-				result.totalDirs++;
-			} else if ($value.data('type') === 'file') {
-				result.totalFiles++;
-			}
-			if ($value.data('size') !== undefined && $value.data('id') !== -1) {
-				//Skip shared as it does not count toward quota
-				result.totalSize += parseInt($value.data('size'));
-			}
-		});
-		return result;
-	},
-	updateFileSummary: function() {
-		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 (this.isEmpty && $summary.length === 1) {
-			$summary.remove();
-		}
-		// If there's no summary create one (createFileSummary checks if there's data)
-		else if ($summary.length === 0) {
-			FileList.createFileSummary();
-		}
-		// There's a summary and data -> Update the summary
-		else if (!this.isEmpty && $summary.length === 1) {
-			var fileSummary = this._calculateFileSummary();
-			var $dirInfo = $('.summary .dirinfo');
-			var $fileInfo = $('.summary .fileinfo');
-			var $connector = $('.summary .connector');
-
-			// Substitute old content with new translations
-			$dirInfo.html(n('files', '%n folder', '%n folders', fileSummary.totalDirs));
-			$fileInfo.html(n('files', '%n file', '%n files', fileSummary.totalFiles));
-			$('.summary .filesize').html(humanFileSize(fileSummary.totalSize));
-
-			// Show only what's necessary (may be hidden)
-			if (fileSummary.totalDirs === 0) {
-				$dirInfo.addClass('hidden');
-				$connector.addClass('hidden');
-			} else {
-				$dirInfo.removeClass('hidden');
-			}
-			if (fileSummary.totalFiles === 0) {
-				$fileInfo.addClass('hidden');
-				$connector.addClass('hidden');
-			} else {
-				$fileInfo.removeClass('hidden');
-			}
-			if (fileSummary.totalDirs > 0 && fileSummary.totalFiles > 0) {
-				$connector.removeClass('hidden');
-			}
-		}
-	},
-	updateEmptyContent: function() {
-		var permissions = $('#permissions').val();
-		var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
-		$('#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');
-		if ($mask.exists()) {
-			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);
-
-		$mask.removeClass('transparent');
-	},
-	/**
-	 * Hide the loading mask.
-	 * @see #showMask
-	 */
-	hideMask: function() {
-		$('#content .mask').remove();
-		this.$el.removeClass('hidden');
-	},
-	scrollTo:function(file) {
-		//scroll to and highlight preselected file
-		var $scrollToRow = FileList.findFileEl(file);
-		if ($scrollToRow.exists()) {
-			$scrollToRow.addClass('searchresult');
-			$(window).scrollTop($scrollToRow.position().top);
-			//remove highlight when hovered over
-			$scrollToRow.one('hover', function() {
-				$scrollToRow.removeClass('searchresult');
 			});
-		}
-	},
-	filter:function(query) {
-		$('#fileList tr:not(.summary)').each(function(i,e) {
-			if ($(e).data('file').toString().toLowerCase().indexOf(query.toLowerCase()) !== -1) {
-				$(e).addClass("searchresult");
-			} else {
-				$(e).removeClass("searchresult");
+		},
+		reloadCallback: function(result) {
+			delete this._reloadCall;
+			this.hideMask();
+
+			if (!result || result.status === 'error') {
+				OC.Notification.show(result.data.message);
+				return;
 			}
-		});
-		//do not use scrollto to prevent removing searchresult css class
-		var first = $('#fileList tr.searchresult').first();
-		if (first.exists()) {
-			$(window).scrollTop(first.position().top);
-		}
-	},
-	unfilter:function() {
-		$('#fileList tr.searchresult').each(function(i,e) {
-			$(e).removeClass("searchresult");
-		});
-	},
-	/**
-	 * Returns whether all files are selected
-	 * @return true if all files are selected, false otherwise
-	 */
-	isAllSelected: function() {
-		return $('#select_all').prop('checked');
-	}
-};
 
-$(document).ready(function() {
-	FileList.initialize();
+			if (result.status === 404) {
+				// go back home
+				this.changeDirectory('/');
+				return;
+			}
+			// aborted ?
+			if (result.status === 0){
+				return;
+			}
 
-	// handle upload events
-	var fileUploadStart = $('#file_upload_start');
+			// TODO: should rather return upload file size through
+			// the files list ajax call
+			this.updateStorageStatistics(true);
 
-	fileUploadStart.on('fileuploaddrop', function(e, data) {
-		OC.Upload.log('filelist handle fileuploaddrop', e, data);
+			if (result.data.permissions) {
+				this.setDirectoryPermissions(result.data.permissions);
+			}
 
-		var dropTarget = $(e.originalEvent.target).closest('tr, .crumb');
-		if (dropTarget && (dropTarget.data('type') === 'dir' || dropTarget.hasClass('crumb'))) { // drag&drop upload to folder
+			this.setFiles(result.data.files);
+		},
 
-			// remember as context
-			data.context = dropTarget;
+		updateStorageStatistics: function(force) {
+			OCA.Files.Files.updateStorageStatistics(this.getCurrentDirectory(), force);
+		},
 
-			var dir = dropTarget.data('file');
-			// if from file list, need to prepend parent dir
-			if (dir) {
-				var parentDir = $('#dir').val() || '/';
-				if (parentDir[parentDir.length - 1] !== '/') {
-					parentDir += '/';
+		getAjaxUrl: function(action, params) {
+			return OCA.Files.Files.getAjaxUrl(action, params);
+		},
+
+		getDownloadUrl: function(files, dir) {
+			return OCA.Files.Files.getDownloadUrl(files, dir || this.getCurrentDirectory());
+		},
+
+		/**
+		 * Generates a preview URL based on the URL space.
+		 * @param urlSpec map with {x: width, y: height, file: file path}
+		 * @return preview URL
+		 */
+		generatePreviewUrl: function(urlSpec) {
+			urlSpec = urlSpec || {};
+			if (!urlSpec.x) {
+				urlSpec.x = this.$table.data('preview-x') || 36;
+			}
+			if (!urlSpec.y) {
+				urlSpec.y = this.$table.data('preview-y') || 36;
+			}
+			urlSpec.y *= window.devicePixelRatio;
+			urlSpec.x *= window.devicePixelRatio;
+			urlSpec.forceIcon = 0;
+			return OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
+		},
+
+		/**
+		 * Lazy load a file's preview.
+		 * 
+		 * @param path path of the file
+		 * @param mime mime type
+		 * @param callback callback function to call when the image was loaded
+		 * @param etag file etag (for caching)
+		 */
+		lazyLoadPreview : function(options) {
+			var self = this;
+			var path = options.path;
+			var mime = options.mime;
+			var ready = options.callback;
+			var etag = options.etag;
+
+			// get mime icon url
+			OCA.Files.Files.getMimeIcon(mime, function(iconURL) {
+				var previewURL,
+					urlSpec = {};
+				ready(iconURL); // set mimeicon URL
+
+				urlSpec.file = OCA.Files.Files.fixPath(path);
+
+				if (etag){
+					// use etag as cache buster
+					urlSpec.c = etag;
 				}
-				dir = parentDir + dir;
+				else {
+					console.warn('OCA.Files.FileList.lazyLoadPreview(): missing etag argument');
+				}
+
+				previewURL = self.generatePreviewUrl(urlSpec);
+				previewURL = previewURL.replace('(', '%28');
+				previewURL = previewURL.replace(')', '%29');
+
+				// preload image to prevent delay
+				// this will make the browser cache the image
+				var img = new Image();
+				img.onload = function(){
+					// if loading the preview image failed (no preview for the mimetype) then img.width will < 5
+					if (img.width > 5) {
+						ready(previewURL);
+					}
+				};
+				img.src = previewURL;
+			});
+		},
+
+		setDirectoryPermissions: function(permissions) {
+			var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
+			this.$el.find('#permissions').val(permissions);
+			this.$el.find('.creatable').toggleClass('hidden', !isCreatable);
+			this.$el.find('.notCreatable').toggleClass('hidden', isCreatable);
+		},
+		/**
+		 * Shows/hides action buttons
+		 *
+		 * @param show true for enabling, false for disabling
+		 */
+		showActions: function(show){
+			this.$el.find('.actions,#file_action_panel').toggleClass('hidden', !show);
+			if (show){
+				// make sure to display according to permissions
+				var permissions = this.getDirectoryPermissions();
+				var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
+				this.$el.find('.creatable').toggleClass('hidden', !isCreatable);
+				this.$el.find('.notCreatable').toggleClass('hidden', isCreatable);
+				// remove old style breadcrumbs (some apps might create them)
+				this.$el.find('#controls .crumb').remove();
+				// refresh breadcrumbs in case it was replaced by an app
+				this.breadcrumb.render();
 			}
 			else{
-				// read full path from crumb
-				dir = dropTarget.data('dir') || '/';
+				this.$el.find('.creatable, .notCreatable').addClass('hidden');
+			}
+		},
+		/**
+		 * Enables/disables viewer mode.
+		 * In viewer mode, apps can embed themselves under the controls bar.
+		 * In viewer mode, the actions of the file list will be hidden.
+		 * @param show true for enabling, false for disabling
+		 */
+		setViewerMode: function(show){
+			this.showActions(!show);
+			this.$el.find('#filestable').toggleClass('hidden', show);
+			this.$el.trigger(new $.Event('changeViewerMode', {viewerModeEnabled: show}));
+		},
+		/**
+		 * 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
+		 * @return deleted element
+		 */
+		remove: function(name, options){
+			options = options || {};
+			var fileEl = this.findFileEl(name);
+			var index = fileEl.index();
+			if (!fileEl.length) {
+				return null;
+			}
+			if (this._selectedFiles[fileEl.data('id')]) {
+				// remove from selection first
+				this._selectFileEl(fileEl, false);
+				this.updateSelectionSummary();
+			}
+			if (this._dragOptions && (fileEl.data('permissions') & OC.PERMISSION_DELETE)) {
+				// file is only draggable when delete permissions are set
+				fileEl.find('td.filename').draggable('destroy');
+			}
+			this.files.splice(index, 1);
+			fileEl.remove();
+			// TODO: improve performance on batch update
+			this.isEmpty = !this.files.length;
+			if (typeof(options.updateSummary) === 'undefined' || !!options.updateSummary) {
+				this.updateEmptyContent();
+				this.fileSummary.remove({type: fileEl.attr('data-type'), size: fileEl.attr('data-size')}, true);
 			}
 
-			// update folder in form
-			data.formData = function(form) {
-				return [
-					{name: 'dir', value: dir},
-					{name: 'requesttoken', value: oc_requesttoken},
-					{name: 'file_directory', value: data.files[0].relativePath}
-				];
-			};
-		} else {
-			// cancel uploads to current dir if no permission
-			var isCreatable = (FileList.getDirectoryPermissions() & OC.PERMISSION_CREATE) !== 0;
-			if (!isCreatable) {
-				return false;
+			var lastIndex = this.$fileList.children().length;
+			// if there are less elements visible than one page
+			// but there are still pending elements in the array,
+			// then directly append the next page
+			if (lastIndex < this.files.length && lastIndex < this.pageSize) {
+				this._nextPage(true);
 			}
-		}
-	});
-	fileUploadStart.on('fileuploadadd', function(e, data) {
-		OC.Upload.log('filelist handle fileuploadadd', e, data);
 
-		//finish delete if we are uploading a deleted file
-		if (FileList.deleteFiles && FileList.deleteFiles.indexOf(data.files[0].name)!==-1) {
-			FileList.finishDelete(null, true); //delete file before continuing
-		}
-
-		// add ui visualization to existing folder
-		if (data.context && data.context.data('type') === 'dir') {
-			// add to existing folder
-
-			// update upload counter ui
-			var uploadText = data.context.find('.uploadtext');
-			var currentUploads = parseInt(uploadText.attr('currentUploads'), 10);
-			currentUploads += 1;
-			uploadText.attr('currentUploads', currentUploads);
-
-			var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads);
-			if (currentUploads === 1) {
-				var img = OC.imagePath('core', 'loading.gif');
-				data.context.find('td.filename').attr('style','background-image:url('+img+')');
-				uploadText.text(translatedText);
-				uploadText.show();
-			} else {
-				uploadText.text(translatedText);
+			return fileEl;
+		},
+		/**
+		 * Finds the index of the row before which the given
+		 * fileData should be inserted, considering the current
+		 * sorting
+		 */
+		_findInsertionIndex: function(fileData) {
+			var index = 0;
+			while (index < this.files.length && this._sortComparator(fileData, this.files[index]) > 0) {
+				index++;
 			}
-		}
+			return index;
+		},
+		/**
+		 * Moves a file to a given target folder.
+		 *
+		 * @param fileNames array of file names to move
+		 * @param targetPath absolute target path
+		 */
+		move: function(fileNames, targetPath) {
+			var self = this;
+			var dir = this.getCurrentDirectory();
+			var target = OC.basename(targetPath);
+			if (!_.isArray(fileNames)) {
+				fileNames = [fileNames];
+			}
+			_.each(fileNames, function(fileName) {
+				var $tr = self.findFileEl(fileName);
+				var $td = $tr.children('td.filename');
+				var oldBackgroundImage = $td.css('background-image');
+				$td.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
+				// TODO: improve performance by sending all file names in a single call
+				$.post(
+					OC.filePath('files', 'ajax', 'move.php'),
+					{
+						dir: dir,
+						file: fileName,
+						target: targetPath
+					},
+					function(result) {
+						if (result) {
+							if (result.status === 'success') {
+								// if still viewing the same directory
+								if (self.getCurrentDirectory() === dir) {
+									// recalculate folder size
+									var oldFile = self.findFileEl(target);
+									var newFile = self.findFileEl(fileName);
+									var oldSize = oldFile.data('size');
+									var newSize = oldSize + newFile.data('size');
+									oldFile.data('size', newSize);
+									oldFile.find('td.filesize').text(OC.Util.humanFileSize(newSize));
 
-	});
-	/*
-	 * when file upload done successfully add row to filelist
-	 * update counter when uploading to sub folder
-	 */
-	fileUploadStart.on('fileuploaddone', function(e, data) {
-		OC.Upload.log('filelist handle fileuploaddone', e, data);
+									// TODO: also update entry in FileList.files
 
-		var response;
-		if (typeof data.result === 'string') {
-			response = data.result;
-		} else {
-			// fetch response from iframe
-			response = data.result[0].body.innerText;
-		}
-		var result=$.parseJSON(response);
-
-		if (typeof result[0] !== 'undefined' && result[0].status === 'success') {
-			var file = result[0];
-			var size = 0;
-
-			if (data.context && data.context.data('type') === 'dir') {
-
-				// update upload counter ui
-				var uploadText = data.context.find('.uploadtext');
-				var currentUploads = parseInt(uploadText.attr('currentUploads'), 10);
-				currentUploads -= 1;
-				uploadText.attr('currentUploads', currentUploads);
-				var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads);
-				if (currentUploads === 0) {
-					var img = OC.imagePath('core', 'filetypes/folder');
-					data.context.find('td.filename').attr('style','background-image:url('+img+')');
-					uploadText.text(translatedText);
-					uploadText.hide();
-				} else {
-					uploadText.text(translatedText);
-				}
-
-				// update folder size
-				size = parseInt(data.context.data('size'), 10);
-				size += parseInt(file.size, 10);
-				data.context.attr('data-size', size);
-				data.context.find('td.filesize').text(humanFileSize(size));
-			} else {
-				// only append new file if uploaded into the current folder
-				if (file.directory !== '/' && file.directory !== FileList.getCurrentDirectory()) {
-
-					var fileDirectory = file.directory.replace('/','').replace(/\/$/, "").split('/');
-
-					if (fileDirectory.length === 1) {
-						fileDirectory = fileDirectory[0];
-
-						// Get the directory 
-						var fd = FileList.findFileEl(fileDirectory);
-						if (fd.length === 0) {
-							var dir = {
-								name: fileDirectory,
-								type: 'dir',
-								mimetype: 'httpd/unix-directory',
-								permissions: file.permissions,
-								size: 0,
-								id: file.parentId
-							};
-							FileList.add(dir, {insert: true});
+									self.remove(fileName);
+								}
+							} else {
+								OC.Notification.hide();
+								if (result.status === 'error' && result.data.message) {
+									OC.Notification.show(result.data.message);
+								}
+								else {
+									OC.Notification.show(t('files', 'Error moving file.'));
+								}
+								// hide notification after 10 sec
+								setTimeout(function() {
+									OC.Notification.hide();
+								}, 10000);
+							}
+						} else {
+							OC.dialogs.alert(t('files', 'Error moving file'), t('files', 'Error'));
 						}
-					} else {
-						fileDirectory = fileDirectory[0];
+						$td.css('background-image', oldBackgroundImage);
 					}
-					
-					fileDirectory = FileList.findFileEl(fileDirectory);
+				);
+			});
 
-					// update folder size
-					size = parseInt(fileDirectory.attr('data-size'), 10);
-					size += parseInt(file.size, 10);
-					fileDirectory.attr('data-size', size);
-					fileDirectory.find('td.filesize').text(humanFileSize(size));
+		},
 
-					return;
-				}
-
-				// add as stand-alone row to filelist
-				size = t('files', 'Pending');
-				if (data.files[0].size>=0) {
-					size=data.files[0].size;
-				}
-				//should the file exist in the list remove it
-				FileList.remove(file.name);
-
-				// create new file context
-				data.context = FileList.add(file, {insert: true});
+		/**
+		 * Triggers file rename input field for the given file name.
+		 * If the user enters a new name, the file will be renamed.
+		 *
+		 * @param oldname file name of the file to rename
+		 */
+		rename: function(oldname) {
+			var self = this;
+			var tr, td, input, form;
+			tr = this.findFileEl(oldname);
+			var oldFileInfo = this.files[tr.index()];
+			tr.data('renaming',true);
+			td = tr.children('td.filename');
+			input = $('<input type="text" class="filename"/>').val(oldname);
+			form = $('<form></form>');
+			form.append(input);
+			td.children('a.name').hide();
+			td.append(form);
+			input.focus();
+			//preselect input
+			var len = input.val().lastIndexOf('.');
+			if ( len === -1 ||
+				tr.data('type') === 'dir' ) {
+				len = input.val().length;
 			}
-		}
-	});
-	fileUploadStart.on('fileuploadstop', function(e, data) {
-		OC.Upload.log('filelist handle fileuploadstop', e, data);
+			input.selectRange(0, len);
+			var checkInput = function () {
+				var filename = input.val();
+				if (filename !== oldname) {
+					// Files.isFileNameValid(filename) throws an exception itself
+					OCA.Files.Files.isFileNameValid(filename);
+					if (self.inList(filename)) {
+						throw t('files', '{new_name} already exists', {new_name: filename});
+					}
+				}
+				return true;
+			};
 
-		//if user pressed cancel hide upload chrome
-		if (data.errorThrown === 'abort') {
-			//cleanup uploading to a dir
-			var uploadText = $('tr .uploadtext');
-			var img = OC.imagePath('core', 'filetypes/folder');
-			uploadText.parents('td.filename').attr('style','background-image:url('+img+')');
-			uploadText.fadeOut();
-			uploadText.attr('currentUploads', 0);
-		}
-	});
-	fileUploadStart.on('fileuploadfail', function(e, data) {
-		OC.Upload.log('filelist handle fileuploadfail', e, data);
+			form.submit(function(event) {
+				event.stopPropagation();
+				event.preventDefault();
+				try {
+					var newName = input.val();
+					if (newName !== oldname) {
+						checkInput();
+						// mark as loading
+						td.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
+						$.ajax({
+							url: OC.filePath('files','ajax','rename.php'),
+							data: {
+								dir : self.getCurrentDirectory(),
+								newname: newName,
+								file: oldname
+							},
+							success: function(result) {
+								var fileInfo;
+								if (!result || result.status === 'error') {
+									OC.dialogs.alert(result.data.message, t('core', 'Could not rename file'));
+									fileInfo = oldFileInfo;
+								}
+								else {
+									fileInfo = result.data;
+								}
+								// reinsert row
+								self.files.splice(tr.index(), 1);
+								tr.remove();
+								self.add(fileInfo);
+							}
+						});
+					}
+					input.tipsy('hide');
+					tr.data('renaming',false);
+					tr.attr('data-file', newName);
+					var path = td.children('a.name').attr('href');
+					// FIXME this will fail if the path contains the filename.
+					td.children('a.name').attr('href', path.replace(encodeURIComponent(oldname), encodeURIComponent(newName)));
+					var basename = newName;
+					if (newName.indexOf('.') > 0 && tr.data('type') !== 'dir') {
+						basename = newName.substr(0, newName.lastIndexOf('.'));
+					}
+					td.find('a.name span.nametext').text(basename);
+					if (newName.indexOf('.') > 0 && tr.data('type') !== 'dir') {
+						if ( ! td.find('a.name span.extension').exists() ) {
+							td.find('a.name span.nametext').append('<span class="extension"></span>');
+						}
+						td.find('a.name span.extension').text(newName.substr(newName.lastIndexOf('.')));
+					}
+					form.remove();
+					self.fileActions.display( tr.find('td.filename'), true);
+					td.children('a.name').show();
+				} catch (error) {
+					input.attr('title', error);
+					input.tipsy({gravity: 'w', trigger: 'manual'});
+					input.tipsy('show');
+					input.addClass('error');
+				}
+				return false;
+			});
+			input.keyup(function(event) {
+				// verify filename on typing
+				try {
+					checkInput();
+					input.tipsy('hide');
+					input.removeClass('error');
+				} catch (error) {
+					input.attr('title', error);
+					input.tipsy({gravity: 'w', trigger: 'manual'});
+					input.tipsy('show');
+					input.addClass('error');
+				}
+				if (event.keyCode === 27) {
+					input.tipsy('hide');
+					tr.data('renaming',false);
+					form.remove();
+					td.children('a.name').show();
+				}
+			});
+			input.click(function(event) {
+				event.stopPropagation();
+				event.preventDefault();
+			});
+			input.blur(function() {
+				form.trigger('submit');
+			});
+		},
+		inList:function(file) {
+			return this.findFileEl(file).length;
+		},
+		/**
+		 * 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 self = this;
+			var params;
+			if (files && files.substr) {
+				files=[files];
+			}
+			if (files) {
+				for (var i=0; i<files.length; i++) {
+					var deleteAction = this.findFileEl(files[i]).children("td.date").children(".action.delete");
+					deleteAction.removeClass('delete-icon').addClass('progress-icon');
+				}
+			}
+			// Finish any existing actions
+			if (this.lastAction) {
+				this.lastAction();
+			}
 
-		//if user pressed cancel hide upload chrome
-		if (data.errorThrown === 'abort') {
-			//cleanup uploading to a dir
-			var uploadText = $('tr .uploadtext');
-			var img = OC.imagePath('core', 'filetypes/folder');
-			uploadText.parents('td.filename').attr('style','background-image:url('+img+')');
-			uploadText.fadeOut();
-			uploadText.attr('currentUploads', 0);
-		}
-	});
+			params = {
+				dir: dir || this.getCurrentDirectory()
+			};
+			if (files) {
+				params.files = JSON.stringify(files);
+			}
+			else {
+				// no files passed, delete all in current dir
+				params.allfiles = true;
+				// show spinner for all files
+				this.$fileList.find('tr>td.date .action.delete').removeClass('delete-icon').addClass('progress-icon');
+			}
+
+			$.post(OC.filePath('files', 'ajax', 'delete.php'),
+					params,
+					function(result) {
+						if (result.status === 'success') {
+							if (params.allfiles) {
+								self.setFiles([]);
+							}
+							else {
+								$.each(files,function(index,file) {
+									var fileEl = self.remove(file, {updateSummary: false});
+									// FIXME: not sure why we need this after the
+									// element isn't even in the DOM any more
+									fileEl.find('input[type="checkbox"]').prop('checked', false);
+									fileEl.removeClass('selected');
+									self.fileSummary.remove({type: fileEl.attr('data-type'), size: fileEl.attr('data-size')});
+								});
+							}
+							// TODO: this info should be returned by the ajax call!
+							self.updateEmptyContent();
+							self.fileSummary.update();
+							self.updateSelectionSummary();
+							self.updateStorageStatistics();
+						} else {
+							if (result.status === 'error' && result.data.message) {
+								OC.Notification.show(result.data.message);
+							}
+							else {
+								OC.Notification.show(t('files', 'Error deleting file.'));
+							}
+							// hide notification after 10 sec
+							setTimeout(function() {
+								OC.Notification.hide();
+							}, 10000);
+							if (params.allfiles) {
+								// reload the page as we don't know what files were deleted
+								// and which ones remain
+								self.reload();
+							}
+							else {
+								$.each(files,function(index,file) {
+									var deleteAction = self.findFileEl(file).find('.action.delete');
+									deleteAction.removeClass('progress-icon').addClass('delete-icon');
+								});
+							}
+						}
+					});
+		},
+		/**
+		 * Creates the file summary section
+		 */
+		_createSummary: function() {
+			var $tr = $('<tr class="summary"></tr>');
+			this.$el.find('tfoot').append($tr);
+
+			return new OCA.Files.FileSummary($tr);
+		},
+		updateEmptyContent: function() {
+			var permissions = this.getDirectoryPermissions();
+			var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
+			this.$el.find('#emptycontent').toggleClass('hidden', !isCreatable || !this.isEmpty);
+			this.$el.find('#filestable thead th').toggleClass('hidden', this.isEmpty);
+		},
+		/**
+		 * Shows the loading mask.
+		 *
+		 * @see #hideMask
+		 */
+		showMask: function() {
+			// in case one was shown before
+			var $mask = this.$el.find('.mask');
+			if ($mask.exists()) {
+				return;
+			}
+
+			this.$table.addClass('hidden');
+
+			$mask = $('<div class="mask transparent"></div>');
+
+			$mask.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
+			$mask.css('background-repeat', 'no-repeat');
+			this.$el.append($mask);
+
+			$mask.removeClass('transparent');
+		},
+		/**
+		 * Hide the loading mask.
+		 * @see #showMask
+		 */
+		hideMask: function() {
+			this.$el.find('.mask').remove();
+			this.$table.removeClass('hidden');
+		},
+		scrollTo:function(file) {
+			//scroll to and highlight preselected file
+			var $scrollToRow = this.findFileEl(file);
+			if ($scrollToRow.exists()) {
+				$scrollToRow.addClass('searchresult');
+				$(window).scrollTop($scrollToRow.position().top);
+				//remove highlight when hovered over
+				$scrollToRow.one('hover', function() {
+					$scrollToRow.removeClass('searchresult');
+				});
+			}
+		},
+		filter:function(query) {
+			this.$fileList.find('tr').each(function(i,e) {
+				if ($(e).data('file').toString().toLowerCase().indexOf(query.toLowerCase()) !== -1) {
+					$(e).addClass("searchresult");
+				} else {
+					$(e).removeClass("searchresult");
+				}
+			});
+			//do not use scrollto to prevent removing searchresult css class
+			var first = this.$fileList.find('tr.searchresult').first();
+			if (first.exists()) {
+				$(window).scrollTop(first.position().top);
+			}
+		},
+		unfilter:function() {
+			this.$fileList.find('tr.searchresult').each(function(i,e) {
+				$(e).removeClass("searchresult");
+			});
+		},
+		/**
+		 * Update UI based on the current selection
+		 */
+		updateSelectionSummary: function() {
+			var summary = this._selectionSummary.summary;
+			var canDelete;
+			if (summary.totalFiles === 0 && summary.totalDirs === 0) {
+				this.$el.find('#headerName a.name>span:first').text(t('files','Name'));
+				this.$el.find('#headerSize a>span:first').text(t('files','Size'));
+				this.$el.find('#modified a>span:first').text(t('files','Modified'));
+				this.$el.find('table').removeClass('multiselect');
+				this.$el.find('.selectedActions').addClass('hidden');
+			}
+			else {
+				canDelete = (this.getDirectoryPermissions() & OC.PERMISSION_DELETE);
+				this.$el.find('.selectedActions').removeClass('hidden');
+				this.$el.find('#headerSize a>span:first').text(OC.Util.humanFileSize(summary.totalSize));
+				var selection = '';
+				if (summary.totalDirs > 0) {
+					selection += n('files', '%n folder', '%n folders', summary.totalDirs);
+					if (summary.totalFiles > 0) {
+						selection += ' & ';
+					}
+				}
+				if (summary.totalFiles > 0) {
+					selection += n('files', '%n file', '%n files', summary.totalFiles);
+				}
+				this.$el.find('#headerName a.name>span:first').text(selection);
+				this.$el.find('#modified a>span:first').text('');
+				this.$el.find('table').addClass('multiselect');
+				this.$el.find('.delete-selected').toggleClass('hidden', !canDelete);
+			}
+		},
+
+		/**
+		 * Returns whether all files are selected
+		 * @return true if all files are selected, false otherwise
+		 */
+		isAllSelected: function() {
+			return this.$el.find('.select-all').prop('checked');
+		},
+
+		/**
+		 * Returns the file info of the selected files
+		 *
+		 * @return array of file names
+		 */
+		getSelectedFiles: function() {
+			return _.values(this._selectedFiles);
+		},
+
+		getUniqueName: function(name) {
+			if (this.findFileEl(name).exists()) {
+				var numMatch;
+				var parts=name.split('.');
+				var extension = "";
+				if (parts.length > 1) {
+					extension=parts.pop();
+				}
+				var base=parts.join('.');
+				numMatch=base.match(/\((\d+)\)/);
+				var num=2;
+				if (numMatch && numMatch.length>0) {
+					num=parseInt(numMatch[numMatch.length-1])+1;
+					base=base.split('(');
+					base.pop();
+					base=$.trim(base.join('('));
+				}
+				name=base+' ('+num+')';
+				if (extension) {
+					name = name+'.'+extension;
+				}
+				// FIXME: ugly recursion
+				return this.getUniqueName(name);
+			}
+			return name;
+		},
+
+		/**
+		 * Setup file upload events related to the file-upload plugin
+		 */
+		setupUploadEvents: function() {
+			var self = this;
+
+			// handle upload events
+			var fileUploadStart = this.$el.find('#file_upload_start');
+
+			fileUploadStart.on('fileuploaddrop', function(e, data) {
+				OC.Upload.log('filelist handle fileuploaddrop', e, data);
+
+				var dropTarget = $(e.originalEvent.target).closest('tr, .crumb');
+				// check if dropped inside this list at all
+				if (dropTarget && !self.$el.has(dropTarget).length) {
+					return false;
+				}
+
+				if (dropTarget && (dropTarget.data('type') === 'dir' || dropTarget.hasClass('crumb'))) { // drag&drop upload to folder
+
+					// remember as context
+					data.context = dropTarget;
+
+					var dir = dropTarget.data('file');
+					// if from file list, need to prepend parent dir
+					if (dir) {
+						var parentDir = self.getCurrentDirectory();
+						if (parentDir[parentDir.length - 1] !== '/') {
+							parentDir += '/';
+						}
+						dir = parentDir + dir;
+					}
+					else{
+						// read full path from crumb
+						dir = dropTarget.data('dir') || '/';
+					}
+
+					// update folder in form
+					data.formData = function(form) {
+						return [
+							{name: 'dir', value: dir},
+							{name: 'requesttoken', value: oc_requesttoken},
+							{name: 'file_directory', value: data.files[0].relativePath}
+						];
+					};
+				} else {
+					// cancel uploads to current dir if no permission
+					var isCreatable = (self.getDirectoryPermissions() & OC.PERMISSION_CREATE) !== 0;
+					if (!isCreatable) {
+						return false;
+					}
+				}
+			});
+			fileUploadStart.on('fileuploadadd', function(e, data) {
+				OC.Upload.log('filelist handle fileuploadadd', e, data);
+
+				//finish delete if we are uploading a deleted file
+				if (self.deleteFiles && self.deleteFiles.indexOf(data.files[0].name)!==-1) {
+					self.finishDelete(null, true); //delete file before continuing
+				}
+
+				// add ui visualization to existing folder
+				if (data.context && data.context.data('type') === 'dir') {
+					// add to existing folder
+
+					// update upload counter ui
+					var uploadText = data.context.find('.uploadtext');
+					var currentUploads = parseInt(uploadText.attr('currentUploads'), 10);
+					currentUploads += 1;
+					uploadText.attr('currentUploads', currentUploads);
+
+					var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads);
+					if (currentUploads === 1) {
+						var img = OC.imagePath('core', 'loading.gif');
+						data.context.find('td.filename').attr('style','background-image:url('+img+')');
+						uploadText.text(translatedText);
+						uploadText.show();
+					} else {
+						uploadText.text(translatedText);
+					}
+				}
+
+			});
+			/*
+			 * when file upload done successfully add row to filelist
+			 * update counter when uploading to sub folder
+			 */
+			fileUploadStart.on('fileuploaddone', function(e, data) {
+				OC.Upload.log('filelist handle fileuploaddone', e, data);
+
+				var response;
+				if (typeof data.result === 'string') {
+					response = data.result;
+				} else {
+					// fetch response from iframe
+					response = data.result[0].body.innerText;
+				}
+				var result=$.parseJSON(response);
+
+				if (typeof result[0] !== 'undefined' && result[0].status === 'success') {
+					var file = result[0];
+					var size = 0;
+
+					if (data.context && data.context.data('type') === 'dir') {
+
+						// update upload counter ui
+						var uploadText = data.context.find('.uploadtext');
+						var currentUploads = parseInt(uploadText.attr('currentUploads'), 10);
+						currentUploads -= 1;
+						uploadText.attr('currentUploads', currentUploads);
+						var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads);
+						if (currentUploads === 0) {
+							var img = OC.imagePath('core', 'filetypes/folder');
+							data.context.find('td.filename').attr('style','background-image:url('+img+')');
+							uploadText.text(translatedText);
+							uploadText.hide();
+						} else {
+							uploadText.text(translatedText);
+						}
+
+						// update folder size
+						size = parseInt(data.context.data('size'), 10);
+						size += parseInt(file.size, 10);
+						data.context.attr('data-size', size);
+						data.context.find('td.filesize').text(humanFileSize(size));
+					} else {
+						// only append new file if uploaded into the current folder
+						if (file.directory !== '/' && file.directory !== self.getCurrentDirectory()) {
+
+							var fileDirectory = file.directory.replace('/','').replace(/\/$/, "").split('/');
+
+							if (fileDirectory.length === 1) {
+								fileDirectory = fileDirectory[0];
+
+								// Get the directory 
+								var fd = self.findFileEl(fileDirectory);
+								if (fd.length === 0) {
+									var dir = {
+										name: fileDirectory,
+										type: 'dir',
+										mimetype: 'httpd/unix-directory',
+										permissions: file.permissions,
+										size: 0,
+										id: file.parentId
+									};
+									self.add(dir, {insert: true});
+								}
+							} else {
+								fileDirectory = fileDirectory[0];
+							}
+							
+							fileDirectory = self.findFileEl(fileDirectory);
+
+							// update folder size
+							size = parseInt(fileDirectory.attr('data-size'), 10);
+							size += parseInt(file.size, 10);
+							fileDirectory.attr('data-size', size);
+							fileDirectory.find('td.filesize').text(humanFileSize(size));
+
+							return;
+						}
+
+						// add as stand-alone row to filelist
+						size = t('files', 'Pending');
+						if (data.files[0].size>=0) {
+							size=data.files[0].size;
+						}
+						//should the file exist in the list remove it
+						self.remove(file.name);
+
+						// create new file context
+						data.context = self.add(file, {animate: true});
+					}
+				}
+			});
+			fileUploadStart.on('fileuploadstop', function(e, data) {
+				OC.Upload.log('filelist handle fileuploadstop', e, data);
+
+				//if user pressed cancel hide upload chrome
+				if (data.errorThrown === 'abort') {
+					//cleanup uploading to a dir
+					var uploadText = $('tr .uploadtext');
+					var img = OC.imagePath('core', 'filetypes/folder');
+					uploadText.parents('td.filename').attr('style','background-image:url('+img+')');
+					uploadText.fadeOut();
+					uploadText.attr('currentUploads', 0);
+				}
+				self.updateStorageStatistics();
+			});
+			fileUploadStart.on('fileuploadfail', function(e, data) {
+				OC.Upload.log('filelist handle fileuploadfail', e, data);
+
+				//if user pressed cancel hide upload chrome
+				if (data.errorThrown === 'abort') {
+					//cleanup uploading to a dir
+					var uploadText = $('tr .uploadtext');
+					var img = OC.imagePath('core', 'filetypes/folder');
+					uploadText.parents('td.filename').attr('style','background-image:url('+img+')');
+					uploadText.fadeOut();
+					uploadText.attr('currentUploads', 0);
+				}
+				self.updateStorageStatistics();
+			});
 
-	$('#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'));
-		});
-	});
-	$('#notification:first-child').on('click', '.suggest', function() {
-		var file = $('#notification > span').attr('data-oldName');
-		FileList.findFileEl(file).removeClass('hidden');
-		OC.Notification.hide();
-	});
-	$('#notification:first-child').on('click', '.cancel', function() {
-		if ($('#notification > span').attr('data-isNewFile')) {
-			FileList.deleteCanceled = false;
-			FileList.deleteFiles = [$('#notification > span').attr('data-oldName')];
 		}
-	});
-	FileList.useUndo=(window.onbeforeunload)?true:false;
+	};
+
+	/**
+	 * Sort comparators.
+	 */
+	FileList.Comparators = {
+		/**
+		 * Compares two file infos by name, making directories appear
+		 * first.
+		 *
+		 * @param fileInfo1 file info
+		 * @param fileInfo2 file info
+		 * @return -1 if the first file must appear before the second one,
+		 * 0 if they are identify, 1 otherwise.
+		 */
+		name: function(fileInfo1, fileInfo2) {
+			if (fileInfo1.type === 'dir' && fileInfo2.type !== 'dir') {
+				return -1;
+			}
+			if (fileInfo1.type !== 'dir' && fileInfo2.type === 'dir') {
+				return 1;
+			}
+			return fileInfo1.name.localeCompare(fileInfo2.name);
+		},
+		/**
+		 * Compares two file infos by size.
+		 *
+		 * @param fileInfo1 file info
+		 * @param fileInfo2 file info
+		 * @return -1 if the first file must appear before the second one,
+		 * 0 if they are identify, 1 otherwise.
+		 */
+		size: function(fileInfo1, fileInfo2) {
+			return fileInfo1.size - fileInfo2.size;
+		},
+		/**
+		 * Compares two file infos by timestamp.
+		 *
+		 * @param fileInfo1 file info
+		 * @param fileInfo2 file info
+		 * @return -1 if the first file must appear before the second one,
+		 * 0 if they are identify, 1 otherwise.
+		 */
+		mtime: function(fileInfo1, fileInfo2) {
+			return fileInfo1.mtime - fileInfo2.mtime;
+		}
+	};
+
+	OCA.Files.FileList = FileList;
+})();
+
+$(document).ready(function() {
+	// FIXME: unused ?
+	OCA.Files.FileList.useUndo = (window.onbeforeunload)?true:false;
 	$(window).bind('beforeunload', function () {
-		if (FileList.lastAction) {
-			FileList.lastAction();
+		if (OCA.Files.FileList.lastAction) {
+			OCA.Files.FileList.lastAction();
 		}
 	});
 	$(window).unload(function () {
 		$(window).trigger('beforeunload');
 	});
 
-	function decodeQuery(query) {
-		return query.replace(/\+/g, ' ');
-	}
-
-	function parseHashQuery() {
-		var hash = window.location.hash,
-			pos = hash.indexOf('?');
-		if (pos >= 0) {
-			return hash.substr(pos + 1);
-		}
-		return '';
-	}
-
-	function parseCurrentDirFromUrl() {
-		var query = parseHashQuery(),
-			params;
-		// try and parse from URL hash first
-		if (query) {
-			params = OC.parseQueryString(decodeQuery(query));
-		}
-		// else read from query attributes
-		if (!params) {
-			params = OC.parseQueryString(decodeQuery(location.search));
-		}
-		return (params && params.dir) || '/';
-	}
-
-	// disable ajax/history API for public app (TODO: until it gets ported)
-	// 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;
-		}
-		else{
-			// read from URL
-			targetDir = parseCurrentDirFromUrl();
-		}
-		if (targetDir) {
-			FileList.changeDirectory(targetDir, 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 5e669a796a..92f97f5d3c 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -8,379 +8,296 @@
  *
  */
 
-/* global OC, t, n, FileList, FileActions */
-/* global getURLParameter, isPublic */
-var Files = {
-	// file space size sync
-	_updateStorageStatistics: function() {
-		Files._updateStorageStatisticsTimeout = null;
-		var currentDir = FileList.getCurrentDirectory(),
-			state = Files.updateStorageStatistics;
-		if (state.dir){
-			if (state.dir === currentDir) {
+/* global getURLParameter */
+/**
+ * Utility class for file related operations
+ */
+(function() {
+	var Files = {
+		// file space size sync
+		_updateStorageStatistics: function(currentDir) {
+			var state = Files.updateStorageStatistics;
+			if (state.dir){
+				if (state.dir === currentDir) {
+					return;
+				}
+				// cancel previous call, as it was for another dir
+				state.call.abort();
+			}
+			state.dir = currentDir;
+			state.call = $.getJSON(OC.filePath('files','ajax','getstoragestats.php') + '?dir=' + encodeURIComponent(currentDir),function(response) {
+				state.dir = null;
+				state.call = null;
+				Files.updateMaxUploadFilesize(response);
+			});
+		},
+		/**
+		 * Update storage statistics such as free space, max upload,
+		 * etc based on the given directory.
+		 *
+		 * Note this function is debounced to avoid making too
+		 * many ajax calls in a row.
+		 *
+		 * @param dir directory
+		 * @param force whether to force retrieving
+		 */
+		updateStorageStatistics: function(dir, force) {
+			if (!OC.currentUser) {
 				return;
 			}
-			// cancel previous call, as it was for another dir
-			state.call.abort();
-		}
-		state.dir = currentDir;
-		state.call = $.getJSON(OC.filePath('files','ajax','getstoragestats.php') + '?dir=' + encodeURIComponent(currentDir),function(response) {
-			state.dir = null;
-			state.call = null;
-			Files.updateMaxUploadFilesize(response);
-		});
-	},
-	updateStorageStatistics: function(force) {
-		if (!OC.currentUser) {
-			return;
-		}
 
-		// debounce to prevent calling too often
-		if (Files._updateStorageStatisticsTimeout) {
-			clearTimeout(Files._updateStorageStatisticsTimeout);
-		}
-		if (force) {
-			Files._updateStorageStatistics();
-		}
-		else {
-			Files._updateStorageStatisticsTimeout = setTimeout(Files._updateStorageStatistics, 250);
-		}
-	},
-
-	updateMaxUploadFilesize:function(response) {
-		if (response === undefined) {
-			return;
-		}
-		if (response.data !== undefined && response.data.uploadMaxFilesize !== undefined) {
-			$('#max_upload').val(response.data.uploadMaxFilesize);
-			$('#free_space').val(response.data.freeSpace);
-			$('#upload.button').attr('original-title', response.data.maxHumanFilesize);
-			$('#usedSpacePercent').val(response.data.usedSpacePercent);
-			Files.displayStorageWarnings();
-		}
-		if (response[0] === undefined) {
-			return;
-		}
-		if (response[0].uploadMaxFilesize !== undefined) {
-			$('#max_upload').val(response[0].uploadMaxFilesize);
-			$('#upload.button').attr('original-title', response[0].maxHumanFilesize);
-			$('#usedSpacePercent').val(response[0].usedSpacePercent);
-			Files.displayStorageWarnings();
-		}
-
-	},
-
-	/**
-	 * Fix path name by removing double slash at the beginning, if any
-	 */
-	fixPath: function(fileName) {
-		if (fileName.substr(0, 2) == '//') {
-			return fileName.substr(1);
-		}
-		return fileName;
-	},
-
-	/**
-	 * Checks whether the given file name is valid.
-	 * @param name file name to check
-	 * @return true if the file name is valid.
-	 * Throws a string exception with an error message if
-	 * the file name is not valid
-	 */
-	isFileNameValid: function (name) {
-		var trimmedName = name.trim();
-		if (trimmedName === '.'	|| trimmedName === '..')
-		{
-			throw t('files', '"{name}" is an invalid file name.', {name: name});
-		} else if (trimmedName.length === 0) {
-			throw t('files', 'File name cannot be empty.');
-		}
-		// check for invalid characters
-		var invalid_characters =
-			['\\', '/', '<', '>', ':', '"', '|', '?', '*', '\n'];
-		for (var i = 0; i < invalid_characters.length; i++) {
-			if (trimmedName.indexOf(invalid_characters[i]) !== -1) {
-				throw t('files', "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.");
+			if (force) {
+				Files._updateStorageStatistics(dir);
 			}
-		}
-		return true;
-	},
-	displayStorageWarnings: function() {
-		if (!OC.Notification.isHidden()) {
-			return;
-		}
-
-		var usedSpacePercent = $('#usedSpacePercent').val();
-		if (usedSpacePercent > 98) {
-			OC.Notification.show(t('files', 'Your storage is full, files can not be updated or synced anymore!'));
-			return;
-		}
-		if (usedSpacePercent > 90) {
-			OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)', {usedSpacePercent: usedSpacePercent}));
-		}
-	},
-
-	displayEncryptionWarning: function() {
-
-		if (!OC.Notification.isHidden()) {
-			return;
-		}
-
-		var encryptedFiles = $('#encryptedFiles').val();
-		var initStatus = $('#encryptionInitStatus').val();
-		if (initStatus === '0') { // enc not initialized, but should be
-			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.show(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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.'));
-			return;
-		}
-	},
-
-	setupDragAndDrop: function() {
-		var $fileList = $('#fileList');
-
-		//drag/drop of files
-		$fileList.find('tr td.filename').each(function(i,e) {
-			if ($(e).parent().data('permissions') & OC.PERMISSION_DELETE) {
-				$(e).draggable(dragOptions);
+			else {
+				Files._updateStorageStatisticsDebounced(dir);
 			}
-		});
+		},
 
-		$fileList.find('tr[data-type="dir"] td.filename').each(function(i,e) {
-			if ($(e).parent().data('permissions') & OC.PERMISSION_CREATE) {
-				$(e).droppable(folderDropOptions);
+		updateMaxUploadFilesize:function(response) {
+			if (response === undefined) {
+				return;
+			}
+			if (response.data !== undefined && response.data.uploadMaxFilesize !== undefined) {
+				$('#max_upload').val(response.data.uploadMaxFilesize);
+				$('#free_space').val(response.data.freeSpace);
+				$('#upload.button').attr('original-title', response.data.maxHumanFilesize);
+				$('#usedSpacePercent').val(response.data.usedSpacePercent);
+				Files.displayStorageWarnings();
+			}
+			if (response[0] === undefined) {
+				return;
+			}
+			if (response[0].uploadMaxFilesize !== undefined) {
+				$('#max_upload').val(response[0].uploadMaxFilesize);
+				$('#upload.button').attr('original-title', response[0].maxHumanFilesize);
+				$('#usedSpacePercent').val(response[0].usedSpacePercent);
+				Files.displayStorageWarnings();
 			}
-		});
-	},
 
-	/**
-	 * 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);
-		}
-		var params = {
-			dir: dir || FileList.getCurrentDirectory(),
-			files: filename
-		};
-		return this.getAjaxUrl('download', params);
-	},
+		},
 
-	/**
-	 * 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() {
-	// FIXME: workaround for trashbin app
-	if (window.trashBinApp) {
-		return;
-	}
-	Files.displayEncryptionWarning();
-	Files.bindKeyboardShortcuts(document, jQuery);
+		/**
+		 * Fix path name by removing double slash at the beginning, if any
+		 */
+		fixPath: function(fileName) {
+			if (fileName.substr(0, 2) == '//') {
+				return fileName.substr(1);
+			}
+			return fileName;
+		},
 
-	Files.setupDragAndDrop();
+		/**
+		 * Checks whether the given file name is valid.
+		 * @param name file name to check
+		 * @return true if the file name is valid.
+		 * Throws a string exception with an error message if
+		 * the file name is not valid
+		 */
+		isFileNameValid: function (name) {
+			var trimmedName = name.trim();
+			if (trimmedName === '.'	|| trimmedName === '..')
+			{
+				throw t('files', '"{name}" is an invalid file name.', {name: name});
+			} else if (trimmedName.length === 0) {
+				throw t('files', 'File name cannot be empty.');
+			}
+			// check for invalid characters
+			var invalidCharacters =
+				['\\', '/', '<', '>', ':', '"', '|', '?', '*', '\n'];
+			for (var i = 0; i < invalidCharacters.length; i++) {
+				if (trimmedName.indexOf(invalidCharacters[i]) !== -1) {
+					throw t('files', "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.");
+				}
+			}
+			return true;
+		},
+		displayStorageWarnings: function() {
+			if (!OC.Notification.isHidden()) {
+				return;
+			}
 
-	$('#file_action_panel').attr('activeAction', false);
+			var usedSpacePercent = $('#usedSpacePercent').val();
+			if (usedSpacePercent > 98) {
+				OC.Notification.show(t('files', 'Your storage is full, files can not be updated or synced anymore!'));
+				return;
+			}
+			if (usedSpacePercent > 90) {
+				OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)',
+					{usedSpacePercent: usedSpacePercent}));
+			}
+		},
 
-	// Triggers invisible file input
-	$('#upload a').on('click', function() {
-		$(this).parent().children('#file_upload_start').trigger('click');
-		return false;
-	});
+		displayEncryptionWarning: function() {
 
-	// Trigger cancelling of file upload
-	$('#uploadprogresswrapper .stop').on('click', function() {
-		OC.Upload.cancelUploads();
-		procesSelection();
-	});
+			if (!OC.Notification.isHidden()) {
+				return;
+			}
 
-	// Show trash bin
-	$('#trash').on('click', function() {
-		window.location=OC.filePath('files_trashbin', '', 'index.php');
-	});
+			var encryptedFiles = $('#encryptedFiles').val();
+			var initStatus = $('#encryptionInitStatus').val();
+			if (initStatus === '0') { // enc not initialized, but should be
+				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.show(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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.'));
+				return;
+			}
+		},
 
-	var lastChecked;
+		/**
+		 * 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);
+			}
+			var params = {
+				dir: dir,
+				files: filename
+			};
+			return this.getAjaxUrl('download', params);
+		},
 
-	// Sets the file link behaviour :
-	$('#fileList').on('click','td.filename a',function(event) {
-		if (event.ctrlKey || event.shiftKey) {
-			event.preventDefault();
-			if (event.shiftKey) {
-				var last = $(lastChecked).parent().parent().prevAll().length;
-				var first = $(this).parent().parent().prevAll().length;
-				var start = Math.min(first, last);
-				var end = Math.max(first, last);
-				var rows = $(this).parent().parent().parent().children('tr');
-				for (var i = start; i < end; i++) {
-					$(rows).each(function(index) {
-						if (index === i) {
-							var checkbox = $(this).children().children('input:checkbox');
-							$(checkbox).attr('checked', 'checked');
-							$(checkbox).parent().parent().addClass('selected');
+		/**
+		 * 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;
+		},
+
+		getMimeIcon: function(mime, ready) {
+			if (Files.getMimeIcon.cache[mime]) {
+				ready(Files.getMimeIcon.cache[mime]);
+			} else {
+				$.get( OC.filePath('files','ajax','mimeicon.php'), {mime: mime}, function(path) {
+					if(OC.Util.hasSVGSupport()){
+						path = path.substr(0, path.length-4) + '.svg';
+					}
+					Files.getMimeIcon.cache[mime]=path;
+					ready(Files.getMimeIcon.cache[mime]);
+				});
+			}
+		},
+
+		/**
+		 * Generates a preview URL based on the URL space.
+		 * @param urlSpec map with {x: width, y: height, file: file path}
+		 * @return preview URL
+		 * @deprecated used OCA.Files.FileList.generatePreviewUrl instead
+		 */
+		generatePreviewUrl: function(urlSpec) {
+			console.warn('DEPRECATED: please use generatePreviewUrl() from an OCA.Files.FileList instance');
+			return OCA.Files.App.fileList.generatePreviewUrl(urlSpec);
+		},
+
+		/**
+		 * Lazy load preview
+		 * @deprecated used OCA.Files.FileList.lazyLoadPreview instead
+		 */
+		lazyLoadPreview : function(path, mime, ready, width, height, etag) {
+			console.warn('DEPRECATED: please use lazyLoadPreview() from an OCA.Files.FileList instance');
+			return OCA.Files.App.fileList.lazyLoadPreview({
+				path: path,
+				mime: mime,
+				callback: ready,
+				width: width,
+				height: height,
+				etag: etag
+			});
+		},
+
+		/**
+		 * Initialize the files view
+		 */
+		initialize: function() {
+			Files.getMimeIcon.cache = {};
+			Files.displayEncryptionWarning();
+			Files.bindKeyboardShortcuts(document, $);
+
+			// TODO: move file list related code (upload) to OCA.Files.FileList
+			$('#file_action_panel').attr('activeAction', false);
+
+			// Triggers invisible file input
+			$('#upload a').on('click', function() {
+				$(this).parent().children('#file_upload_start').trigger('click');
+				return false;
+			});
+
+			// Trigger cancelling of file upload
+			$('#uploadprogresswrapper .stop').on('click', function() {
+				OC.Upload.cancelUploads();
+			});
+
+			// drag&drop support using jquery.fileupload
+			// TODO use OC.dialogs
+			$(document).bind('drop dragover', function (e) {
+					e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
+				});
+
+			//do a background scan if needed
+			scanFiles();
+
+			// display storage warnings
+			setTimeout(Files.displayStorageWarnings, 100);
+			OC.Notification.setDefault(Files.displayStorageWarnings);
+
+			// only possible at the moment if user is logged in or the files app is loaded
+			if (OC.currentUser && OCA.Files.App) {
+				// start on load - we ask the server every 5 minutes
+				var updateStorageStatisticsInterval = 5*60*1000;
+				var updateStorageStatisticsIntervalId = setInterval(OCA.Files.App.fileList.updateStorageStatistics, updateStorageStatisticsInterval);
+
+				// TODO: this should also stop when switching to another view
+				// Use jquery-visibility to de-/re-activate file stats sync
+				if ($.support.pageVisibility) {
+					$(document).on({
+						'show.visibility': function() {
+							if (!updateStorageStatisticsIntervalId) {
+								updateStorageStatisticsIntervalId = setInterval(OCA.Files.App.fileList.updateStorageStatistics, updateStorageStatisticsInterval);
+							}
+						},
+						'hide.visibility': function() {
+							clearInterval(updateStorageStatisticsIntervalId);
+							updateStorageStatisticsIntervalId = 0;
 						}
 					});
 				}
 			}
-			var checkbox = $(this).parent().children('input:checkbox');
-			lastChecked = checkbox;
-			if ($(checkbox).attr('checked')) {
-				$(checkbox).removeAttr('checked');
-				$(checkbox).parent().parent().removeClass('selected');
-				$('#select_all').removeAttr('checked');
-			} else {
-				$(checkbox).attr('checked', 'checked');
-				$(checkbox).parent().parent().toggleClass('selected');
-				var selectedCount = $('td.filename input:checkbox:checked').length;
-				if (selectedCount === $('td.filename input:checkbox').length) {
-					$('#select_all').attr('checked', 'checked');
-				}
-			}
-			procesSelection();
-		} else {
-			var filename=$(this).parent().parent().attr('data-file');
-			var tr = FileList.findFileEl(filename);
-			var renaming=tr.data('renaming');
-			if (!renaming) {
-				FileActions.currentFile = $(this).parent();
-				var mime=FileActions.getCurrentMimeType();
-				var type=FileActions.getCurrentType();
-				var permissions = FileActions.getCurrentPermissions();
-				var action=FileActions.getDefault(mime,type, permissions);
-				if (action) {
-					event.preventDefault();
-					action(filename);
-				}
-			}
-		}
 
-	});
-
-	// Sets the select_all checkbox behaviour :
-	$('#select_all').click(function() {
-		if ($(this).attr('checked')) {
-			// Check all
-			$('td.filename input:checkbox').attr('checked', true);
-			$('td.filename input:checkbox').parent().parent().addClass('selected');
-		} else {
-			// Uncheck all
-			$('td.filename input:checkbox').attr('checked', false);
-			$('td.filename input:checkbox').parent().parent().removeClass('selected');
-		}
-		procesSelection();
-	});
-
-	$('#fileList').on('change', 'td.filename input:checkbox',function(event) {
-		if (event.shiftKey) {
-			var last = $(lastChecked).parent().parent().prevAll().length;
-			var first = $(this).parent().parent().prevAll().length;
-			var start = Math.min(first, last);
-			var end = Math.max(first, last);
-			var rows = $(this).parent().parent().parent().children('tr');
-			for (var i = start; i < end; i++) {
-				$(rows).each(function(index) {
-					if (index === i) {
-						var checkbox = $(this).children().children('input:checkbox');
-						$(checkbox).attr('checked', 'checked');
-						$(checkbox).parent().parent().addClass('selected');
-					}
-				});
-			}
-		}
-		var selectedCount=$('td.filename input:checkbox:checked').length;
-		$(this).parent().parent().toggleClass('selected');
-		if (!$(this).attr('checked')) {
-			$('#select_all').attr('checked',false);
-		} else {
-			if (selectedCount===$('td.filename input:checkbox').length) {
-				$('#select_all').attr('checked',true);
-			}
-		}
-		procesSelection();
-	});
-
-	$('.download').click('click',function(event) {
-		var files;
-		var dir = FileList.getCurrentDirectory();
-		if (FileList.isAllSelected()) {
-			files = OC.basename(dir);
-			dir = OC.dirname(dir) || '/';
-		}
-		else {
-			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(Files.getDownloadUrl(files, dir));
-		return false;
-	});
-
-	$('.delete-selected').click(function(event) {
-		var files = Files.getSelectedFiles('name');
-		event.preventDefault();
-		if (FileList.isAllSelected()) {
-			files = null;
-		}
-		FileList.do_delete(files);
-		return false;
-	});
-
-	// drag&drop support using jquery.fileupload
-	// TODO use OC.dialogs
-	$(document).bind('drop dragover', function (e) {
-			e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
-	});
-
-	//do a background scan if needed
-	scanFiles();
-
-	// display storage warnings
-	setTimeout(Files.displayStorageWarnings, 100);
-	OC.Notification.setDefault(Files.displayStorageWarnings);
-
-	// only possible at the moment if user is logged in
-	if (OC.currentUser) {
-		// start on load - we ask the server every 5 minutes
-		var updateStorageStatisticsInterval = 5*60*1000;
-		var updateStorageStatisticsIntervalId = setInterval(Files.updateStorageStatistics, updateStorageStatisticsInterval);
-
-		// Use jquery-visibility to de-/re-activate file stats sync
-		if ($.support.pageVisibility) {
-			$(document).on({
-				'show.visibility': function() {
-					if (!updateStorageStatisticsIntervalId) {
-						updateStorageStatisticsIntervalId = setInterval(Files.updateStorageStatistics, updateStorageStatisticsInterval);
-					}
-				},
-				'hide.visibility': function() {
-					clearInterval(updateStorageStatisticsIntervalId);
-					updateStorageStatisticsIntervalId = 0;
+			$('#app-settings-header').on('click', function() {
+				var $settings = $('#app-settings');
+				$settings.toggleClass('opened');
+				if ($settings.hasClass('opened')) {
+					$settings.find('input').focus();
 				}
 			});
+
+			//scroll to and highlight preselected file
+			/*
+			if (getURLParameter('scrollto')) {
+				FileList.scrollTo(getURLParameter('scrollto'));
+			}
+			*/
 		}
 	}
 
-	//scroll to and highlight preselected file
-	if (getURLParameter('scrollto')) {
-		FileList.scrollTo(getURLParameter('scrollto'));
-	}
-});
+	Files._updateStorageStatisticsDebounced = _.debounce(Files._updateStorageStatistics, 250);
+	OCA.Files.Files = Files;
+})();
 
 function scanFiles(force, dir, users) {
 	if (!OC.currentUser) {
@@ -414,7 +331,9 @@ function scanFiles(force, dir, users) {
 	scannerEventSource.listen('done',function(count) {
 		scanFiles.scanning=false;
 		console.log('done after ' + count + ' files');
-		Files.updateStorageStatistics();
+		if (OCA.Files.App) {
+			OCA.Files.App.fileList.updateStorageStatistics(true);
+		}
 	});
 	scannerEventSource.listen('user',function(user) {
 		console.log('scanning files for ' + user);
@@ -422,34 +341,23 @@ function scanFiles(force, dir, users) {
 }
 scanFiles.scanning=false;
 
-function boolOperationFinished(data, callback) {
-	result = jQuery.parseJSON(data.responseText);
-	Files.updateMaxUploadFilesize(result);
-	if (result.status === 'success') {
-		callback.call();
-	} else {
-		alert(result.data.message);
-	}
-}
-
+// TODO: move to FileList
 var createDragShadow = function(event) {
 	//select dragged file
+	var FileList = OCA.Files.App.fileList;
 	var isDragSelected = $(event.target).parents('tr').find('td input:first').prop('checked');
 	if (!isDragSelected) {
 		//select dragged file
-		$(event.target).parents('tr').find('td input:first').prop('checked',true);
+		FileList._selectFileEl($(event.target).parents('tr:first'), true);
 	}
 
-	var selectedFiles = Files.getSelectedFiles();
+	// do not show drag shadow for too many files
+	var selectedFiles = _.first(FileList.getSelectedFiles(), FileList.pageSize);
+	selectedFiles = _.sortBy(selectedFiles, FileList._fileInfoCompare);
 
 	if (!isDragSelected && selectedFiles.length === 1) {
 		//revert the selection
-		$(event.target).parents('tr').find('td input:first').prop('checked',false);
-	}
-
-	//also update class when we dragged more than one file
-	if (selectedFiles.length > 1) {
-		$(event.target).parents('tr').addClass('selected');
+		FileList._selectFileEl($(event.target).parents('tr:first'), false);
 	}
 
 	// build dragshadow
@@ -457,18 +365,21 @@ var createDragShadow = function(event) {
 	var tbody = $('<tbody></tbody>');
 	dragshadow.append(tbody);
 
-	var dir=$('#dir').val();
+	var dir = FileList.getCurrentDirectory();
 
 	$(selectedFiles).each(function(i,elem) {
-		var newtr = $('<tr/>').attr('data-dir', dir).attr('data-filename', elem.name).attr('data-origin', elem.origin);
+		var newtr = $('<tr/>')
+			.attr('data-dir', dir)
+			.attr('data-file', elem.name)
+			.attr('data-origin', elem.origin);
 		newtr.append($('<td/>').addClass('filename').text(elem.name));
-		newtr.append($('<td/>').addClass('size').text(humanFileSize(elem.size)));
+		newtr.append($('<td/>').addClass('size').text(OC.Util.humanFileSize(elem.size)));
 		tbody.append(newtr);
 		if (elem.type === 'dir') {
 			newtr.find('td.filename').attr('style','background-image:url('+OC.imagePath('core', 'filetypes/folder.png')+')');
 		} else {
-			var path = getPathForPreview(elem.name);
-			Files.lazyLoadPreview(path, elem.mime, function(previewpath) {
+			var path = dir + '/' + elem.name;
+			OCA.Files.App.files.lazyLoadPreview(path, elem.mime, function(previewpath) {
 				newtr.find('td.filename').attr('style','background-image:url('+previewpath+')');
 			}, null, null, elem.etag);
 		}
@@ -479,264 +390,69 @@ var createDragShadow = function(event) {
 
 //options for file drag/drop
 //start&stop handlers needs some cleaning up
+// TODO: move to FileList class
 var dragOptions={
-	revert: 'invalid', revertDuration: 300,
-	opacity: 0.7, zIndex: 100, appendTo: 'body', cursorAt: { left: 24, top: 18 },
-	helper: createDragShadow, cursor: 'move',
-		start: function(event, ui){
-			var $selectedFiles = $('td.filename input:checkbox:checked');
-			if($selectedFiles.length > 1){
-				$selectedFiles.parents('tr').fadeTo(250, 0.2);
-			}
-			else{
-				$(this).fadeTo(250, 0.2);
-			}
-		},
-		stop: function(event, ui) {
-			var $selectedFiles = $('td.filename input:checkbox:checked');
-			if($selectedFiles.length > 1){
-				$selectedFiles.parents('tr').fadeTo(250, 1);
-			}
-			else{
-				$(this).fadeTo(250, 1);
-			}
-			$('#fileList tr td.filename').addClass('ui-draggable');
+	revert: 'invalid',
+	revertDuration: 300,
+	opacity: 0.7,
+	zIndex: 100,
+	appendTo: 'body',
+	cursorAt: { left: 24, top: 18 },
+	helper: createDragShadow,
+	cursor: 'move',
+	start: function(event, ui){
+		var $selectedFiles = $('td.filename input:checkbox:checked');
+		if($selectedFiles.length > 1){
+			$selectedFiles.parents('tr').fadeTo(250, 0.2);
 		}
+		else{
+			$(this).fadeTo(250, 0.2);
+		}
+	},
+	stop: function(event, ui) {
+		var $selectedFiles = $('td.filename input:checkbox:checked');
+		if($selectedFiles.length > 1){
+			$selectedFiles.parents('tr').fadeTo(250, 1);
+		}
+		else{
+			$(this).fadeTo(250, 1);
+		}
+		$('#fileList tr td.filename').addClass('ui-draggable');
+	}
 };
 // sane browsers support using the distance option
 if ( $('html.ie').length === 0) {
 	dragOptions['distance'] = 20;
 }
 
-var folderDropOptions={
+// TODO: move to FileList class
+var folderDropOptions = {
 	hoverClass: "canDrop",
 	drop: function( event, ui ) {
-		//don't allow moving a file into a selected folder
+		// don't allow moving a file into a selected folder
+		var FileList = OCA.Files.App.fileList;
 		if ($(event.target).parents('tr').find('td input:first').prop('checked') === true) {
 			return false;
 		}
 
-		var target = $(this).closest('tr').data('file');
+		var targetPath = FileList.getCurrentDirectory() + '/' + $(this).closest('tr').data('file');
 
-		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: dir+'/'+target }, function(result) {
-				if (result) {
-					if (result.status === 'success') {
-						//recalculate folder size
-						var oldFile = FileList.findFileEl(target);
-						var newFile = FileList.findFileEl(file);
-						var oldSize = oldFile.data('size');
-						var newSize = oldSize + newFile.data('size');
-						oldFile.data('size', newSize);
-						oldFile.find('td.filesize').text(humanFileSize(newSize));
+		var files = FileList.getSelectedFiles();
+		if (files.length === 0) {
+			// single one selected without checkbox?
+			files = _.map(ui.helper.find('tr'), FileList.elementToFile);
+		}
 
-						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);
-			});
-		});
+		FileList.move(_.pluck(files, 'name'), targetPath);
 	},
 	tolerance: 'pointer'
 };
 
-function procesSelection() {
-	var selected = Files.getSelectedFiles();
-	var selectedFiles = selected.filter(function(el) {
-		return el.type==='file';
-	});
-	var selectedFolders = selected.filter(function(el) {
-		return el.type==='dir';
-	});
-	if (selectedFiles.length === 0 && selectedFolders.length === 0) {
-		$('#headerName span.name').text(t('files','Name'));
-		$('#headerSize').text(t('files','Size'));
-		$('#modified').text(t('files','Modified'));
-		$('table').removeClass('multiselect');
-		$('.selectedActions').hide();
-		$('#select_all').removeAttr('checked');
-	}
-	else {
-		$('.selectedActions').show();
-		var totalSize = 0;
-		for(var i=0; i<selectedFiles.length; i++) {
-			totalSize+=selectedFiles[i].size;
-		}
-		for(var i=0; i<selectedFolders.length; i++) {
-			totalSize+=selectedFolders[i].size;
-		}
-		$('#headerSize').text(humanFileSize(totalSize));
-		var selection = '';
-		if (selectedFolders.length > 0) {
-			selection += n('files', '%n folder', '%n folders', selectedFolders.length);
-			if (selectedFiles.length > 0) {
-				selection += ' & ';
-			}
-		}
-		if (selectedFiles.length>0) {
-			selection += n('files', '%n file', '%n files', selectedFiles.length);
-		}
-		$('#headerName span.name').text(selection);
-		$('#modified').text('');
-		$('table').addClass('multiselect');
-	}
-}
-
-/**
- * @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
- */
-Files.getSelectedFiles = function(property) {
-	var elements=$('td.filename input:checkbox:checked').parent().parent();
-	var files=[];
-	elements.each(function(i,element) {
-		var file={
-			name:$(element).attr('data-file'),
-			mime:$(element).data('mime'),
-			type:$(element).data('type'),
-			size:$(element).data('size'),
-			etag:$(element).data('etag'),
-			origin: $(element).data('id')
-		};
-		if (property) {
-			files.push(file[property]);
-		} else {
-			files.push(file);
-		}
-	});
-	return files;
-}
-
-Files.getMimeIcon = function(mime, ready) {
-	if (Files.getMimeIcon.cache[mime]) {
-		ready(Files.getMimeIcon.cache[mime]);
-	} else {
-		$.get( OC.filePath('files','ajax','mimeicon.php'), {mime: mime}, function(path) {
-			if(OC.Util.hasSVGSupport()){
-				path = path.substr(0, path.length-4) + '.svg';
-			}
-			Files.getMimeIcon.cache[mime]=path;
-			ready(Files.getMimeIcon.cache[mime]);
-		});
-	}
-}
-Files.getMimeIcon.cache={};
-
-function getPathForPreview(name) {
-	var path = $('#dir').val() + '/' + 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 previewURL,
-			urlSpec = {};
-		ready(iconURL); // set mimeicon URL
-
-		urlSpec.file = Files.fixPath(path);
-
-		if (etag){
-			// use etag as cache buster
-			urlSpec.c = etag;
-		}
-		else {
-			console.warn('Files.lazyLoadPreview(): missing etag argument');
-		}
-
-		previewURL = Files.generatePreviewUrl(urlSpec);
-		previewURL = previewURL.replace('(', '%28');
-		previewURL = previewURL.replace(')', '%29');
-
-		// preload image to prevent delay
-		// this will make the browser cache the image
-		var img = new Image();
-		img.onload = function(){
-			// if loading the preview image failed (no preview for the mimetype) then img.width will < 5
-			if (img.width > 5) {
-				ready(previewURL);
-			}
-		};
-		img.src = previewURL;
-	});
-};
-
-function getUniqueName(name) {
-	if (FileList.findFileEl(name).exists()) {
-		var numMatch;
-		var parts=name.split('.');
-		var extension = "";
-		if (parts.length > 1) {
-			extension=parts.pop();
-		}
-		var base=parts.join('.');
-		numMatch=base.match(/\((\d+)\)/);
-		var num=2;
-		if (numMatch && numMatch.length>0) {
-			num=parseInt(numMatch[numMatch.length-1])+1;
-			base=base.split('(');
-			base.pop();
-			base=$.trim(base.join('('));
-		}
-		name=base+' ('+num+')';
-		if (extension) {
-			name = name+'.'+extension;
-		}
-		return getUniqueName(name);
-	}
-	return name;
-}
-
-function checkTrashStatus() {
-	$.post(OC.filePath('files_trashbin', 'ajax', 'isEmpty.php'), function(result) {
-		if (result.data.isEmpty === false) {
-			$("input[type=button][id=trash]").removeAttr("disabled");
-		}
-	});
-}
-
 // override core's fileDownloadPath (legacy)
 function fileDownloadPath(dir, file) {
-	return Files.getDownloadUrl(file, dir);
+	return OCA.Files.Files.getDownloadUrl(file, dir);
 }
 
+// for backward compatibility
+window.Files = OCA.Files.Files;
+
diff --git a/apps/files/js/filesummary.js b/apps/files/js/filesummary.js
new file mode 100644
index 0000000000..104dabf1b0
--- /dev/null
+++ b/apps/files/js/filesummary.js
@@ -0,0 +1,195 @@
+/**
+* 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, n, t */
+
+(function() {
+	/**
+	 * The FileSummary class encapsulates the file summary values and
+	 * the logic to render it in the given container
+	 * @param $tr table row element
+	 * $param summary optional initial summary value
+	 */
+	var FileSummary = function($tr) {
+		this.$el = $tr;
+		this.clear();
+		this.render();
+	};
+
+	FileSummary.prototype = {
+		summary: {
+			totalFiles: 0,
+			totalDirs: 0,
+			totalSize: 0
+		},
+
+		/**
+		 * Adds file
+		 * @param file file to add
+		 * @param update whether to update the display
+		 */
+		add: function(file, update) {
+			if (file.type === 'dir' || file.mime === 'httpd/unix-directory') {
+				this.summary.totalDirs++;
+			}
+			else {
+				this.summary.totalFiles++;
+			}
+			this.summary.totalSize += parseInt(file.size, 10) || 0;
+			if (!!update) {
+				this.update();
+			}
+		},
+		/**
+		 * Removes file
+		 * @param file file to remove
+		 * @param update whether to update the display
+		 */
+		remove: function(file, update) {
+			if (file.type === 'dir' || file.mime === 'httpd/unix-directory') {
+				this.summary.totalDirs--;
+			}
+			else {
+				this.summary.totalFiles--;
+			}
+			this.summary.totalSize -= parseInt(file.size, 10) || 0;
+			if (!!update) {
+				this.update();
+			}
+		},
+		/**
+		 * Returns the total of files and directories
+		 */
+		getTotal: function() {
+			return this.summary.totalDirs + this.summary.totalFiles;
+		},
+		/**
+		 * Recalculates the summary based on the given files array
+		 * @param files array of files
+		 */
+		calculate: function(files) {
+			var file;
+			var summary = {
+				totalDirs: 0,
+				totalFiles: 0,
+				totalSize: 0
+			};
+
+			for (var i = 0; i < files.length; i++) {
+				file = files[i];
+				if (file.type === 'dir' || file.mime === 'httpd/unix-directory') {
+					summary.totalDirs++;
+				}
+				else {
+					summary.totalFiles++;
+				}
+				summary.totalSize += parseInt(file.size, 10) || 0;
+			}
+			this.setSummary(summary);
+		},
+		/**
+		 * Clears the summary
+		 */
+		clear: function() {
+			this.calculate([]);
+		},
+		/**
+		 * Sets the current summary values
+		 * @param summary map
+		 */
+		setSummary: function(summary) {
+			this.summary = summary;
+			this.update();
+		},
+
+		/**
+		 * Renders the file summary element
+		 */
+		update: function() {
+			if (!this.$el) {
+				return;
+			}
+			if (!this.summary.totalFiles && !this.summary.totalDirs) {
+				this.$el.addClass('hidden');
+				return;
+			}
+			// There's a summary and data -> Update the summary
+			this.$el.removeClass('hidden');
+			var $dirInfo = this.$el.find('.dirinfo');
+			var $fileInfo = this.$el.find('.fileinfo');
+			var $connector = this.$el.find('.connector');
+
+			// Substitute old content with new translations
+			$dirInfo.html(n('files', '%n folder', '%n folders', this.summary.totalDirs));
+			$fileInfo.html(n('files', '%n file', '%n files', this.summary.totalFiles));
+			this.$el.find('.filesize').html(OC.Util.humanFileSize(this.summary.totalSize));
+
+			// Show only what's necessary (may be hidden)
+			if (this.summary.totalDirs === 0) {
+				$dirInfo.addClass('hidden');
+				$connector.addClass('hidden');
+			} else {
+				$dirInfo.removeClass('hidden');
+			}
+			if (this.summary.totalFiles === 0) {
+				$fileInfo.addClass('hidden');
+				$connector.addClass('hidden');
+			} else {
+				$fileInfo.removeClass('hidden');
+			}
+			if (this.summary.totalDirs > 0 && this.summary.totalFiles > 0) {
+				$connector.removeClass('hidden');
+			}
+		},
+		render: function() {
+			if (!this.$el) {
+				return;
+			}
+			// TODO: ideally this should be separate to a template or something
+			var summary = this.summary;
+			var directoryInfo = n('files', '%n folder', '%n folders', summary.totalDirs);
+			var fileInfo = n('files', '%n file', '%n files', summary.totalFiles);
+
+			var infoVars = {
+				dirs: '<span class="dirinfo">'+directoryInfo+'</span><span class="connector">',
+				files: '</span><span class="fileinfo">'+fileInfo+'</span>'
+			};
+
+			// don't show the filesize column, if filesize is NaN (e.g. in trashbin)
+			var fileSize = '';
+			if (!isNaN(summary.totalSize)) {
+				fileSize = '<td class="filesize">' + OC.Util.humanFileSize(summary.totalSize) + '</td>';
+			}
+
+			var info = t('files', '{dirs} and {files}', infoVars);
+
+			var $summary = $('<td><span class="info">'+info+'</span></td>'+fileSize+'<td></td>');
+
+			if (!this.summary.totalFiles && !this.summary.totalDirs) {
+				this.$el.addClass('hidden');
+			}
+
+			this.$el.append($summary);
+		}
+	};
+	OCA.Files.FileSummary = FileSummary;
+})();
+
diff --git a/apps/files/js/keyboardshortcuts.js b/apps/files/js/keyboardshortcuts.js
index 9d6c3ae8c3..b2f2cd0e58 100644
--- a/apps/files/js/keyboardshortcuts.js
+++ b/apps/files/js/keyboardshortcuts.js
@@ -12,7 +12,6 @@
  * enter: open file/folder
  * delete/backspace: delete file/folder
  *****************************/
-var Files = Files || {};
 (function(Files) {
 	var keys = [];
 	var keyCodes = {
@@ -167,4 +166,4 @@ var Files = Files || {};
 			removeA(keys, event.keyCode);
 		});
 	};
-})(Files);
+})((OCA.Files && OCA.Files.Files) || {});
diff --git a/apps/files/js/navigation.js b/apps/files/js/navigation.js
new file mode 100644
index 0000000000..c58a284e83
--- /dev/null
+++ b/apps/files/js/navigation.js
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2014
+ *
+ * @author Vincent Petry
+ * @copyright 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.
+ *
+ */
+
+(function() {
+
+	var Navigation = function($el) {
+		this.initialize($el);
+	};
+
+	Navigation.prototype = {
+
+		/**
+		 * Currently selected item in the list
+		 */
+		_activeItem: null,
+
+		/**
+		 * Currently selected container
+		 */
+		$currentContent: null,
+
+		/**
+		 * Initializes the navigation from the given container
+		 * @param $el element containing the navigation
+		 */
+		initialize: function($el) {
+			this.$el = $el;
+			this._activeItem = null;
+			this.$currentContent = null;
+			this._setupEvents();
+		},
+
+		/**
+		 * Setup UI events
+		 */
+		_setupEvents: function() {
+			this.$el.on('click', 'li a', _.bind(this._onClickItem, this));
+		},
+
+		/**
+		 * Returns the container of the currently active app.
+		 *
+		 * @return app container
+		 */
+		getActiveContainer: function() {
+			return this.$currentContent;
+		},
+
+		/**
+		 * Returns the currently active item
+		 * 
+		 * @return item ID
+		 */
+		getActiveItem: function() {
+			return this._activeItem;
+		},
+
+		/**
+		 * Switch the currently selected item, mark it as selected and
+		 * make the content container visible, if any.
+		 *
+		 * @param string itemId id of the navigation item to select
+		 * @param array options "silent" to not trigger event
+		 */
+		setActiveItem: function(itemId, options) {
+			var oldItemId = this._activeItem;
+			if (itemId === this._activeItem) {
+				if (!options || !options.silent) {
+					this.$el.trigger(
+						new $.Event('itemChanged', {itemId: itemId, previousItemId: oldItemId})
+					);
+				}
+				return;
+			}
+			this.$el.find('li').removeClass('selected');
+			if (this.$currentContent) {
+				this.$currentContent.addClass('hidden');
+				this.$currentContent.trigger(jQuery.Event('hide'));
+			}
+			this._activeItem = itemId;
+			this.$el.find('li[data-id=' + itemId + ']').addClass('selected');
+			this.$currentContent = $('#app-content-' + itemId);
+			this.$currentContent.removeClass('hidden');
+			if (!options || !options.silent) {
+				this.$currentContent.trigger(jQuery.Event('show'));
+				this.$el.trigger(
+					new $.Event('itemChanged', {itemId: itemId, previousItemId: oldItemId})
+				);
+			}
+		},
+
+		/**
+		 * Returns whether a given item exists
+		 */
+		itemExists: function(itemId) {
+			return this.$el.find('li[data-id=' + itemId + ']').length;
+		},
+
+		/**
+		 * Event handler for when clicking on an item.
+		 */
+		_onClickItem: function(ev) {
+			var $target = $(ev.target);
+			var itemId = $target.closest('li').attr('data-id');
+			this.setActiveItem(itemId);
+			return false;
+		}
+	};
+
+	OCA.Files.Navigation = Navigation;
+
+})();
diff --git a/apps/files/l10n/af_ZA.php b/apps/files/l10n/af_ZA.php
index 0157af093e..62c4ec70ac 100644
--- a/apps/files/l10n/af_ZA.php
+++ b/apps/files/l10n/af_ZA.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Share" => "Deel",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","")
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index 9a78e3bbff..ea715c3888 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -27,22 +27,22 @@ $TRANSLATIONS = array(
 "Share" => "شارك",
 "Delete permanently" => "حذف بشكل دائم",
 "Rename" => "إعادة تسميه",
+"Your download is being prepared. This might take some time if the files are big." => "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير.",
+"Pending" => "قيد الانتظار",
 "Error moving file" => "حدث خطأ أثناء نقل الملف",
 "Error" => "خطأ",
-"Pending" => "قيد الانتظار",
+"Name" => "اسم",
+"Size" => "حجم",
+"Modified" => "معدل",
 "_%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}",
 "_Uploading %n file_::_Uploading %n files_" => array("لا يوجد ملفات %n لتحميلها","تحميل 1 ملف %n","تحميل 2 ملف %n","يتم تحميل عدد قليل من ملفات %n","يتم تحميل عدد كبير من ملفات %n","يتم تحميل ملفات %n"),
 "Your storage is full, files can not be updated or synced anymore!" => "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
 "Your storage is almost full ({usedSpacePercent}%)" => "مساحتك التخزينية امتلأت تقريبا ",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
 "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." => "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير.",
-"Name" => "اسم",
-"Size" => "حجم",
-"Modified" => "معدل",
+"{dirs} and {files}" => "{dirs} و {files}",
 "%s could not be renamed" => "%s  لا يمكن إعادة تسميته. ",
 "File handling" => "التعامل مع الملف",
 "Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
@@ -52,12 +52,13 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 = غير محدود",
 "Maximum input size for ZIP files" => "الحد الأقصى المسموح به لملفات ZIP",
 "Save" => "حفظ",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "استخدم هذا العنوان لـ  <a href=\"%s\" target=\"_blank\">الدخول الى ملفاتك عن طريق WebDAV</a>",
 "New" => "جديد",
 "Text file" => "ملف",
 "New folder" => "مجلد جديد",
 "Folder" => "مجلد",
 "From link" => "من رابط",
-"Deleted files" => "حذف الملفات",
 "Cancel upload" => "إلغاء رفع الملفات",
 "Nothing in here. Upload something!" => "لا يوجد شيء هنا. إرفع بعض الملفات!",
 "Download" => "تحميل",
diff --git a/apps/files/l10n/ast.php b/apps/files/l10n/ast.php
index 5c6af60be3..b0ba541778 100644
--- a/apps/files/l10n/ast.php
+++ b/apps/files/l10n/ast.php
@@ -1,29 +1,67 @@
 <?php
 $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Nun pudo movese %s - Yá existe un ficheru con esi nome.",
+"Could not move %s" => "Nun pudo movese %s",
 "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.",
+"Unable to set upload directory." => "Nun se puede afitar la carpeta de xubida.",
+"Invalid Token" => "Token inválidu",
 "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 upload_max_filesize directive in php.ini: " => "El ficheru xubíu perpasa la direutiva \"upload_max_filesize\" del ficheru php.ini",
 "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",
+"Upload failed. Could not find uploaded file" => "Xubida fallía.  Nun se pudo atopar el ficheru xubíu.",
+"Upload failed. Could not get file info." => "Falló la xubida.  Nun se pudo obtener la información del ficheru.",
+"Invalid directory." => "Carpeta non válida.",
 "Files" => "Ficheros",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nun se pudo xubir {filename}, paez que ye un directoriu o tien 0 bytes",
+"Upload cancelled." => "Xubida encaboxada.",
+"Could not get result from server." => "Nun se pudo obtener el resultáu del servidor.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "La xubida del ficheru ta en progresu.  Si dexes esta páxina encaboxarase la xubida.",
+"{new_name} already exists" => "{new_name} yá existe",
 "Share" => "Compartir",
+"Delete permanently" => "Desaniciar dafechu",
 "Rename" => "Renomar",
+"Your download is being prepared. This might take some time if the files are big." => "Ta preparándose la descarga.  Esto podría llevar dalgún tiempu si los ficheros son grandes.",
+"Error moving file" => "Fallu moviendo'l ficheru",
 "Error" => "Fallu",
+"Name" => "Nome",
+"Size" => "Tamañu",
+"Modified" => "Modificáu",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Name" => "Nome",
-"Size" => "Tamañu",
+"Your storage is full, files can not be updated or synced anymore!" => "L'almacenamientu ta completu, ¡yá nun se pueden anovar o sincronizar ficheros!",
+"Your storage is almost full ({usedSpacePercent}%)" => "L'almacenamientu ta casi completu ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Deshabilitose'l cifráu pero los tos ficheros tovía tan cifraos.  Por favor, vete a los axustes personales pa descrifrar los tos ficheros.",
+"%s could not be renamed" => "Nun se puede renomar %s ",
+"File handling" => "Alministración de ficheros",
+"Maximum upload size" => "Tamañu máximu de xubida",
+"max. possible: " => "máx. posible:",
+"Needed for multi-file and folder downloads." => "Ye necesariu pa descargues multificheru y de carpetes",
+"Enable ZIP-download" => "Activar descarga ZIP",
+"0 is unlimited" => "0 ye illimitao",
+"Maximum input size for ZIP files" => "Tamañu máximu d'entrada pa ficheros ZIP",
 "Save" => "Guardar",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Usa esta direición pa <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a los ficheros a traviés de WebDAV</a>",
+"New" => "Nuevu",
+"Text file" => "Ficheru de testu",
 "New folder" => "Nueva carpeta",
 "Folder" => "Carpeta",
+"From link" => "Dende enllaz",
 "Cancel upload" => "Encaboxar xuba",
+"Nothing in here. Upload something!" => "Nun hai nada equí. ¡Xubi daqué!",
 "Download" => "Descargar",
-"Delete" => "Desaniciar"
+"Delete" => "Desaniciar",
+"Upload too large" => "La xubida ye demasiao grande",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los ficheros que tas intentando xubir perpasen el tamañu máximu pa les xubíes de ficheros nesti servidor.",
+"Files are being scanned, please wait." => "Tan escaniándose los ficheros, espera por favor.",
+"Current scanning" => "Escanéu actual"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index d9cad21e79..7b5bac636d 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -12,17 +12,18 @@ $TRANSLATIONS = array(
 "Share" => "Споделяне",
 "Delete permanently" => "Изтриване завинаги",
 "Rename" => "Преименуване",
-"Error" => "Грешка",
 "Pending" => "Чакащо",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Error" => "Грешка",
 "Name" => "Име",
 "Size" => "Размер",
 "Modified" => "Променено",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Maximum upload size" => "Максимален размер за качване",
 "0 is unlimited" => "Ползвайте 0 за без ограничения",
 "Save" => "Запис",
+"WebDAV" => "WebDAV",
 "New" => "Ново",
 "Text file" => "Текстов файл",
 "New folder" => "Нова папка",
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index 4d71d7dacd..dd639b4955 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -19,14 +19,14 @@ $TRANSLATIONS = array(
 "{new_name} already exists" => "{new_name} টি বিদ্যমান",
 "Share" => "ভাগাভাগি কর",
 "Rename" => "পূনঃনামকরণ",
-"Error" => "সমস্যা",
 "Pending" => "মুলতুবি",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Error" => "সমস্যা",
 "Name" => "রাম",
 "Size" => "আকার",
 "Modified" => "পরিবর্তিত",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "File handling" => "ফাইল হ্যার্ডলিং",
 "Maximum upload size" => "আপলোডের সর্বোচ্চ আকার",
 "max. possible: " => "অনুমোদিত  সর্বোচ্চ  আকার",
@@ -35,6 +35,7 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "০ এর অর্থ অসীম",
 "Maximum input size for ZIP files" => "ZIP ফাইলের ইনপুটের সর্বোচ্চ আকার",
 "Save" => "সংরক্ষণ",
+"WebDAV" => "WebDAV",
 "New" => "নতুন",
 "Text file" => "টেক্সট ফাইল",
 "Folder" => "ফোল্ডার",
diff --git a/apps/files/l10n/bs.php b/apps/files/l10n/bs.php
index 47276eccda..89ff91da03 100644
--- a/apps/files/l10n/bs.php
+++ b/apps/files/l10n/bs.php
@@ -1,11 +1,11 @@
 <?php
 $TRANSLATIONS = array(
 "Share" => "Podijeli",
+"Name" => "Ime",
+"Size" => "Veličina",
 "_%n folder_::_%n folders_" => array("","",""),
 "_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
-"Name" => "Ime",
-"Size" => "Veličina",
 "Save" => "Spasi",
 "New folder" => "Nova fascikla",
 "Folder" => "Fasikla"
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 6938da220b..240e61bfd9 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -42,14 +42,18 @@ $TRANSLATIONS = array(
 "Share" => "Comparteix",
 "Delete permanently" => "Esborra permanentment",
 "Rename" => "Reanomena",
+"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.",
+"Pending" => "Pendent",
+"Error moving file." => "Error en moure el fitxer.",
 "Error moving file" => "Error en moure el fitxer",
 "Error" => "Error",
-"Pending" => "Pendent",
 "Could not rename file" => "No es pot canviar el nom de fitxer",
 "Error deleting file." => "Error en esborrar el fitxer.",
+"Name" => "Nom",
+"Size" => "Mida",
+"Modified" => "Modificat",
 "_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
 "_%n file_::_%n files_" => array("%n fitxer","%n fitxers"),
-"{dirs} and {files}" => "{dirs} i {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Pujant %n fitxer","Pujant %n fitxers"),
 "\"{name}\" is an invalid file name." => "\"{name}\" no es un fitxer vàlid.",
 "Your storage is full, files can not be updated or synced anymore!" => "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden actualitzar o sincronitzar!",
@@ -57,10 +61,7 @@ $TRANSLATIONS = array(
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou.",
 "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.",
-"Name" => "Nom",
-"Size" => "Mida",
-"Modified" => "Modificat",
+"{dirs} and {files}" => "{dirs} i {files}",
 "%s could not be renamed" => "%s no es pot canviar el nom",
 "File handling" => "Gestió de fitxers",
 "Maximum upload size" => "Mida màxima de pujada",
@@ -70,13 +71,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 és sense límit",
 "Maximum input size for ZIP files" => "Mida màxima d'entrada per fitxers ZIP",
 "Save" => "Desa",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
 "New" => "Nou",
 "New text file" => "Nou fitxer de text",
 "Text file" => "Fitxer de text",
 "New folder" => "Carpeta nova",
 "Folder" => "Carpeta",
 "From link" => "Des d'enllaç",
-"Deleted files" => "Fitxers esborrats",
 "Cancel upload" => "Cancel·la la pujada",
 "You don’t have permission to upload or create files here" => "No teniu permisos per a pujar o crear els fitxers aquí",
 "Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 40bb288ca1..1af95dc7fe 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -42,14 +42,18 @@ $TRANSLATIONS = array(
 "Share" => "Sdílet",
 "Delete permanently" => "Trvale odstranit",
 "Rename" => "Přejmenovat",
+"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.",
+"Pending" => "Nevyřízené",
+"Error moving file." => "Chyba při přesunu souboru.",
 "Error moving file" => "Chyba při přesunu souboru",
 "Error" => "Chyba",
-"Pending" => "Nevyřízené",
 "Could not rename file" => "Nepodařilo se přejmenovat soubor",
 "Error deleting file." => "Chyba při mazání souboru.",
+"Name" => "Název",
+"Size" => "Velikost",
+"Modified" => "Upraveno",
 "_%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ů"),
-"{dirs} and {files}" => "{dirs} a {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"),
 "\"{name}\" is an invalid file name." => "\"{name}\" je neplatným názvem souboru.",
 "Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
@@ -57,10 +61,7 @@ $TRANSLATIONS = array(
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
 "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.",
-"Name" => "Název",
-"Size" => "Velikost",
-"Modified" => "Upraveno",
+"{dirs} and {files}" => "{dirs} a {files}",
 "%s could not be renamed" => "%s nemůže být přejmenován",
 "Upload (max. %s)" => "Nahrát (max. %s)",
 "File handling" => "Zacházení se soubory",
@@ -71,13 +72,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 znamená bez omezení",
 "Maximum input size for ZIP files" => "Maximální velikost vstupu pro ZIP soubory",
 "Save" => "Uložit",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Použijte <a href=\"%s\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>",
 "New" => "Nový",
 "New text file" => "Nový textový soubor",
 "Text file" => "Textový soubor",
 "New folder" => "Nová složka",
 "Folder" => "Složka",
 "From link" => "Z odkazu",
-"Deleted files" => "Odstraněné soubory",
 "Cancel upload" => "Zrušit odesílání",
 "You don’t have permission to upload or create files here" => "Nemáte oprávnění zde nahrávat či vytvářet soubory",
 "Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php
index f0c12b2fde..6b4796c3e9 100644
--- a/apps/files/l10n/cy_GB.php
+++ b/apps/files/l10n/cy_GB.php
@@ -21,17 +21,17 @@ $TRANSLATIONS = array(
 "Share" => "Rhannu",
 "Delete permanently" => "Dileu'n barhaol",
 "Rename" => "Ailenwi",
-"Error" => "Gwall",
+"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.",
 "Pending" => "I ddod",
+"Error" => "Gwall",
+"Name" => "Enw",
+"Size" => "Maint",
+"Modified" => "Addaswyd",
 "_%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.",
-"Name" => "Enw",
-"Size" => "Maint",
-"Modified" => "Addaswyd",
 "File handling" => "Trafod ffeiliau",
 "Maximum upload size" => "Maint mwyaf llwytho i fyny",
 "max. possible: " => "mwyaf. posib:",
@@ -44,7 +44,6 @@ $TRANSLATIONS = array(
 "Text file" => "Ffeil destun",
 "Folder" => "Plygell",
 "From link" => "Dolen o",
-"Deleted files" => "Ffeiliau ddilewyd",
 "Cancel upload" => "Diddymu llwytho i fyny",
 "Nothing in here. Upload something!" => "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!",
 "Download" => "Llwytho i lawr",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 9a6ea9c0dc..1f73fb89f4 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -42,14 +42,18 @@ $TRANSLATIONS = array(
 "Share" => "Del",
 "Delete permanently" => "Slet permanent",
 "Rename" => "Omdøb",
+"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.",
+"Pending" => "Afventer",
+"Error moving file." => "Fejl ved flytning af fil",
 "Error moving file" => "Fejl ved flytning af fil",
 "Error" => "Fejl",
-"Pending" => "Afventer",
 "Could not rename file" => "Kunne ikke omdøbe filen",
 "Error deleting file." => "Fejl ved sletnign af fil.",
+"Name" => "Navn",
+"Size" => "Størrelse",
+"Modified" => "Ændret",
 "_%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!",
@@ -57,11 +61,9 @@ $TRANSLATIONS = array(
 "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.",
-"Name" => "Navn",
-"Size" => "Størrelse",
-"Modified" => "Ændret",
+"{dirs} and {files}" => "{dirs} og {files}",
 "%s could not be renamed" => "%s kunne ikke omdøbes",
+"Upload (max. %s)" => "Upload (max. %s)",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimal upload-størrelse",
 "max. possible: " => "max. mulige: ",
@@ -70,13 +72,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 er ubegrænset",
 "Maximum input size for ZIP files" => "Maksimal størrelse på ZIP filer",
 "Save" => "Gem",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Brug denne adresse for at <a href=\"%s\" target=\"_blank\">tilgå dine filer via WebDAV</a>",
 "New" => "Ny",
 "New text file" => "Ny tekstfil",
 "Text file" => "Tekstfil",
 "New folder" => "Ny Mappe",
 "Folder" => "Mappe",
 "From link" => "Fra link",
-"Deleted files" => "Slettede filer",
 "Cancel upload" => "Fortryd upload",
 "You don’t have permission to upload or create files here" => "Du har ikke tilladelse til at uploade eller oprette filer her",
 "Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 1d15469dac..a1472b6e09 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden.",
 "Invalid directory." => "Ungültiges Verzeichnis.",
 "Files" => "Dateien",
+"All files" => "Alle Dateien",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
 "Total file size {size1} exceeds upload limit {size2}" => "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
@@ -42,14 +43,18 @@ $TRANSLATIONS = array(
 "Share" => "Teilen",
 "Delete permanently" => "Endgültig löschen",
 "Rename" => "Umbenennen",
+"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.",
+"Pending" => "Ausstehend",
+"Error moving file." => "Fehler beim Verschieben der Datei.",
 "Error moving file" => "Fehler beim Verschieben der Datei",
 "Error" => "Fehler",
-"Pending" => "Ausstehend",
 "Could not rename file" => "Die Datei konnte nicht umbenannt werden",
 "Error deleting file." => "Fehler beim Löschen der Datei.",
+"Name" => "Name",
+"Size" => "Größe",
+"Modified" => "Geändert",
 "_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
 "_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
-"{dirs} and {files}" => "{dirs} und {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"),
 "\"{name}\" is an invalid file name." => "\"{name}\" ist kein gültiger Dateiname.",
 "Your storage is full, files can not be updated or synced anymore!" => "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
@@ -57,10 +62,7 @@ $TRANSLATIONS = array(
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melden Dich nochmals ab und wieder an.",
 "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.",
-"Name" => "Name",
-"Size" => "Größe",
-"Modified" => "Geändert",
+"{dirs} and {files}" => "{dirs} und {files}",
 "%s could not be renamed" => "%s konnte nicht umbenannt werden",
 "Upload (max. %s)" => "Hochladen (max. %s)",
 "File handling" => "Dateibehandlung",
@@ -71,13 +73,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 bedeutet unbegrenzt",
 "Maximum input size for ZIP files" => "Maximale Größe für ZIP-Dateien",
 "Save" => "Speichern",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
 "New" => "Neu",
 "New text file" => "Neue Textdatei",
 "Text file" => "Textdatei",
 "New folder" => "Neuer Ordner",
 "Folder" => "Ordner",
 "From link" => "Von einem Link",
-"Deleted files" => "Gelöschte Dateien",
 "Cancel upload" => "Upload abbrechen",
 "You don’t have permission to upload or create files here" => "Du besitzt hier keine Berechtigung, um Dateien hochzuladen oder zu erstellen",
 "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
diff --git a/apps/files/l10n/de_CH.php b/apps/files/l10n/de_CH.php
index 907b9e1b67..fc80bfdc7d 100644
--- a/apps/files/l10n/de_CH.php
+++ b/apps/files/l10n/de_CH.php
@@ -23,18 +23,18 @@ $TRANSLATIONS = array(
 "Share" => "Teilen",
 "Delete permanently" => "Endgültig löschen",
 "Rename" => "Umbenennen",
-"Error" => "Fehler",
+"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.",
 "Pending" => "Ausstehend",
+"Error" => "Fehler",
+"Name" => "Name",
+"Size" => "Grösse",
+"Modified" => "Geändert",
 "_%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"),
 "Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.",
-"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.",
-"Name" => "Name",
-"Size" => "Grösse",
-"Modified" => "Geändert",
 "%s could not be renamed" => "%s konnte nicht umbenannt werden",
 "File handling" => "Dateibehandlung",
 "Maximum upload size" => "Maximale Upload-Grösse",
@@ -44,12 +44,12 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 bedeutet unbegrenzt",
 "Maximum input size for ZIP files" => "Maximale Grösse für ZIP-Dateien",
 "Save" => "Speichern",
+"WebDAV" => "WebDAV",
 "New" => "Neu",
 "Text file" => "Textdatei",
 "New folder" => "Neues Verzeichnis",
 "Folder" => "Ordner",
 "From link" => "Von einem Link",
-"Deleted files" => "Gelöschte Dateien",
 "Cancel upload" => "Upload abbrechen",
 "Nothing in here. Upload something!" => "Alles leer. Laden Sie etwas hoch!",
 "Download" => "Herunterladen",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 41ca83e6f8..d94361a676 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Die Dateiinformationen konnten nicht abgerufen werden.",
 "Invalid directory." => "Ungültiges Verzeichnis.",
 "Files" => "Dateien",
+"All files" => "Alle Dateien",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
 "Total file size {size1} exceeds upload limit {size2}" => "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
@@ -42,14 +43,18 @@ $TRANSLATIONS = array(
 "Share" => "Teilen",
 "Delete permanently" => "Endgültig löschen",
 "Rename" => "Umbenennen",
+"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.",
+"Pending" => "Ausstehend",
+"Error moving file." => "Fehler beim Verschieben der Datei.",
 "Error moving file" => "Fehler beim Verschieben der Datei",
 "Error" => "Fehler",
-"Pending" => "Ausstehend",
 "Could not rename file" => "Die Datei konnte nicht umbenannt werden",
 "Error deleting file." => "Fehler beim Löschen der Datei.",
+"Name" => "Name",
+"Size" => "Größe",
+"Modified" => "Geändert",
 "_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
 "_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
-"{dirs} and {files}" => "{dirs} und {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hoch geladen","%n Dateien werden hoch geladen"),
 "\"{name}\" is an invalid file name." => "\"{name}\" ist kein gültiger Dateiname.",
 "Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
@@ -57,10 +62,7 @@ $TRANSLATIONS = array(
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden sich nochmals ab und wieder an.",
 "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.",
-"Name" => "Name",
-"Size" => "Größe",
-"Modified" => "Geändert",
+"{dirs} and {files}" => "{dirs} und {files}",
 "%s could not be renamed" => "%s konnte nicht umbenannt werden",
 "Upload (max. %s)" => "Hochladen (max. %s)",
 "File handling" => "Dateibehandlung",
@@ -71,13 +73,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 bedeutet unbegrenzt",
 "Maximum input size for ZIP files" => "Maximale Größe für ZIP-Dateien",
 "Save" => "Speichern",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
 "New" => "Neu",
 "New text file" => "Neue Textdatei",
 "Text file" => "Textdatei",
 "New folder" => "Neuer Ordner",
 "Folder" => "Ordner",
 "From link" => "Von einem Link",
-"Deleted files" => "Gelöschte Dateien",
 "Cancel upload" => "Upload abbrechen",
 "You don’t have permission to upload or create files here" => "Sie besitzen hier keine Berechtigung Dateien hochzuladen oder zu erstellen",
 "Nothing in here. Upload something!" => "Alles leer. Laden Sie etwas hoch!",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index f103d0621e..8929263681 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -42,14 +42,18 @@ $TRANSLATIONS = array(
 "Share" => "Διαμοιρασμός",
 "Delete permanently" => "Μόνιμη διαγραφή",
 "Rename" => "Μετονομασία",
+"Your download is being prepared. This might take some time if the files are big." => "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος.",
+"Pending" => "Εκκρεμεί",
+"Error moving file." => "Σφάλμα κατά τη μετακίνηση του αρχείου.",
 "Error moving file" => "Σφάλμα κατά τη μετακίνηση του αρχείου",
 "Error" => "Σφάλμα",
-"Pending" => "Εκκρεμεί",
 "Could not rename file" => "Αδυναμία μετονομασίας αρχείου",
 "Error deleting file." => "Σφάλμα διαγραφής αρχείου.",
+"Name" => "Όνομα",
+"Size" => "Μέγεθος",
+"Modified" => "Τροποποιήθηκε",
 "_%n folder_::_%n folders_" => array("%n φάκελος","%n φάκελοι"),
 "_%n file_::_%n files_" => array("%n αρχείο","%n αρχεία"),
-"{dirs} and {files}" => "{Κατάλογοι αρχείων} και {αρχεία}",
 "_Uploading %n file_::_Uploading %n files_" => array("Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"),
 "\"{name}\" is an invalid file name." => "Το \"{name}\" είναι μη έγκυρο όνομα αρχείου.",
 "Your storage is full, files can not be updated or synced anymore!" => "Ο αποθηκευτικός σας χώρος είναι γεμάτος, τα αρχεία δεν μπορούν να ενημερωθούν ή να συγχρονιστούν πια!",
@@ -57,11 +61,9 @@ $TRANSLATIONS = array(
 "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." => "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος.",
-"Name" => "Όνομα",
-"Size" => "Μέγεθος",
-"Modified" => "Τροποποιήθηκε",
+"{dirs} and {files}" => "{Κατάλογοι αρχείων} και {αρχεία}",
 "%s could not be renamed" => "Αδυναμία μετονομασίας του %s",
+"Upload (max. %s)" => "Διαμοιρασμός (max. %s)",
 "File handling" => "Διαχείριση αρχείων",
 "Maximum upload size" => "Μέγιστο μέγεθος αποστολής",
 "max. possible: " => "μέγιστο δυνατό:",
@@ -70,13 +72,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 για απεριόριστο",
 "Maximum input size for ZIP files" => "Μέγιστο μέγεθος για αρχεία ZIP",
 "Save" => "Αποθήκευση",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Χρησιμοποιήστε αυτήν την διεύθυνση για να αποκτήσετε <a href=\"%s\" target=\"_blank\">πρόσβαση στα αρχεία σας μέσω WebDAV</a>",
 "New" => "Νέο",
 "New text file" => "Νέο αρχείο κειμένου",
 "Text file" => "Αρχείο κειμένου",
 "New folder" => "Νέος κατάλογος",
 "Folder" => "Φάκελος",
 "From link" => "Από σύνδεσμο",
-"Deleted files" => "Διαγραμμένα αρχεία",
 "Cancel upload" => "Ακύρωση αποστολής",
 "You don’t have permission to upload or create files here" => "Δεν έχετε δικαιώματα φόρτωσης ή δημιουργίας αρχείων εδώ",
 "Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!",
diff --git a/apps/files/l10n/en_GB.php b/apps/files/l10n/en_GB.php
index 93e1007e37..e64b7f4cc9 100644
--- a/apps/files/l10n/en_GB.php
+++ b/apps/files/l10n/en_GB.php
@@ -42,14 +42,18 @@ $TRANSLATIONS = array(
 "Share" => "Share",
 "Delete permanently" => "Delete permanently",
 "Rename" => "Rename",
+"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.",
+"Pending" => "Pending",
+"Error moving file." => "Error moving file.",
 "Error moving file" => "Error moving file",
 "Error" => "Error",
-"Pending" => "Pending",
 "Could not rename file" => "Could not rename file",
 "Error deleting file." => "Error deleting file.",
+"Name" => "Name",
+"Size" => "Size",
+"Modified" => "Modified",
 "_%n folder_::_%n folders_" => array("%n folder","%n folders"),
 "_%n file_::_%n files_" => array("%n file","%n files"),
-"{dirs} and {files}" => "{dirs} and {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Uploading %n file","Uploading %n files"),
 "\"{name}\" is an invalid file name." => "\"{name}\" is an invalid file name.",
 "Your storage is full, files can not be updated or synced anymore!" => "Your storage is full, files can not be updated or synced anymore!",
@@ -57,10 +61,7 @@ $TRANSLATIONS = array(
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
 "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.",
-"Name" => "Name",
-"Size" => "Size",
-"Modified" => "Modified",
+"{dirs} and {files}" => "{dirs} and {files}",
 "%s could not be renamed" => "%s could not be renamed",
 "Upload (max. %s)" => "Upload (max. %s)",
 "File handling" => "File handling",
@@ -71,13 +72,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 is unlimited",
 "Maximum input size for ZIP files" => "Maximum input size for ZIP files",
 "Save" => "Save",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>",
 "New" => "New",
 "New text file" => "New text file",
 "Text file" => "Text file",
 "New folder" => "New folder",
 "Folder" => "Folder",
 "From link" => "From link",
-"Deleted files" => "Deleted files",
 "Cancel upload" => "Cancel upload",
 "You don’t have permission to upload or create files here" => "You don’t have permission to upload or create files here",
 "Nothing in here. Upload something!" => "Nothing in here. Upload something!",
diff --git a/apps/files/l10n/en_NZ.php b/apps/files/l10n/en_NZ.php
new file mode 100644
index 0000000000..0157af093e
--- /dev/null
+++ b/apps/files/l10n/en_NZ.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/eo.php b/apps/files/l10n/eo.php
index dfa6f7ec03..9aaf72d98a 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -35,20 +35,20 @@ $TRANSLATIONS = array(
 "Share" => "Kunhavigi",
 "Delete permanently" => "Forigi por ĉiam",
 "Rename" => "Alinomigi",
+"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.",
+"Pending" => "Traktotaj",
 "Error moving file" => "Eraris movo de dosiero",
 "Error" => "Eraro",
-"Pending" => "Traktotaj",
 "Could not rename file" => "Ne povis alinomiĝi dosiero",
-"_%n folder_::_%n folders_" => array("%n dosierujo","%n dosierujoj"),
-"_%n file_::_%n files_" => array("%n dosiero","%n dosieroj"),
-"{dirs} and {files}" => "{dirs} kaj {files}",
-"_Uploading %n file_::_Uploading %n files_" => array("Alŝutatas %n dosiero","Alŝutatas %n dosieroj"),
-"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.",
 "Name" => "Nomo",
 "Size" => "Grando",
 "Modified" => "Modifita",
+"_%n folder_::_%n folders_" => array("%n dosierujo","%n dosierujoj"),
+"_%n file_::_%n files_" => array("%n dosiero","%n dosieroj"),
+"_Uploading %n file_::_Uploading %n files_" => array("Alŝutatas %n dosiero","Alŝutatas %n dosieroj"),
+"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}%)",
+"{dirs} and {files}" => "{dirs} kaj {files}",
 "%s could not be renamed" => "%s ne povis alinomiĝi",
 "File handling" => "Dosieradministro",
 "Maximum upload size" => "Maksimuma alŝutogrando",
@@ -58,12 +58,12 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 signifas senlime",
 "Maximum input size for ZIP files" => "Maksimuma enirgrando por ZIP-dosieroj",
 "Save" => "Konservi",
+"WebDAV" => "WebDAV",
 "New" => "Nova",
 "Text file" => "Tekstodosiero",
 "New folder" => "Nova dosierujo",
 "Folder" => "Dosierujo",
 "From link" => "El ligilo",
-"Deleted files" => "Forigitaj dosieroj",
 "Cancel upload" => "Nuligi alŝuton",
 "You don’t have permission to upload or create files here" => "Vi ne havas permeson alŝuti aŭ krei dosierojn ĉi tie",
 "Nothing in here. Upload something!" => "Nenio estas ĉi tie. Alŝutu ion!",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index fd1d915ea8..0a56a324a2 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "Actualización fallida. No se pudo obtener información del archivo.",
 "Invalid directory." => "Directorio inválido.",
 "Files" => "Archivos",
+"All files" => "Todos los archivos",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes",
 "Total file size {size1} exceeds upload limit {size2}" => "El tamaño total del archivo {size1} excede el límite {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}",
@@ -42,14 +43,18 @@ $TRANSLATIONS = array(
 "Share" => "Compartir",
 "Delete permanently" => "Eliminar permanentemente",
 "Rename" => "Renombrar",
+"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.",
+"Pending" => "Pendiente",
+"Error moving file." => "Error al mover el archivo.",
 "Error moving file" => "Error moviendo archivo",
 "Error" => "Error",
-"Pending" => "Pendiente",
 "Could not rename file" => "No se pudo renombrar el archivo",
 "Error deleting file." => "Error al borrar el archivo",
+"Name" => "Nombre",
+"Size" => "Tamaño",
+"Modified" => "Modificado",
 "_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
 "_%n file_::_%n files_" => array("%n archivo","%n archivos"),
-"{dirs} and {files}" => "{dirs} y {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"),
 "\"{name}\" is an invalid file name." => "\"{name}\" es un nombre de archivo inválido.",
 "Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!",
@@ -57,10 +62,7 @@ $TRANSLATIONS = array(
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "La app de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
 "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.",
-"Name" => "Nombre",
-"Size" => "Tamaño",
-"Modified" => "Modificado",
+"{dirs} and {files}" => "{dirs} y {files}",
 "%s could not be renamed" => "%s no pudo ser renombrado",
 "Upload (max. %s)" => "Subida (máx. %s)",
 "File handling" => "Administración de archivos",
@@ -71,13 +73,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 significa ilimitado",
 "Maximum input size for ZIP files" => "Tamaño máximo para archivos ZIP de entrada",
 "Save" => "Guardar",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use esta URL <a href=\"%s\" target=\"_blank\">para acceder via WebDAV</a>",
 "New" => "Nuevo",
 "New text file" => "Nuevo archivo de texto",
 "Text file" => "Archivo de texto",
 "New folder" => "Nueva carpeta",
 "Folder" => "Carpeta",
 "From link" => "Desde enlace",
-"Deleted files" => "Archivos eliminados",
 "Cancel upload" => "Cancelar subida",
 "You don’t have permission to upload or create files here" => "No tienes permisos para subir o crear archivos aquí.",
 "Nothing in here. Upload something!" => "No hay nada aquí. ¡Suba algo!",
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 4d4a349a10..9edbe50206 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -38,24 +38,24 @@ $TRANSLATIONS = array(
 "Share" => "Compartir",
 "Delete permanently" => "Borrar permanentemente",
 "Rename" => "Cambiar nombre",
+"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.",
+"Pending" => "Pendientes",
 "Error moving file" => "Error moviendo el archivo",
 "Error" => "Error",
-"Pending" => "Pendientes",
 "Could not rename file" => "No se pudo renombrar el archivo",
 "Error deleting file." => "Error al borrar el archivo.",
+"Name" => "Nombre",
+"Size" => "Tamaño",
+"Modified" => "Modificado",
 "_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
 "_%n file_::_%n files_" => array("%n archivo","%n archivos"),
-"{dirs} and {files}" => "{carpetas} y {archivos}",
 "_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"),
 "Your storage is full, files can not be updated or synced anymore!" => "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando",
 "Your storage is almost full ({usedSpacePercent}%)" => "El almacenamiento está casi lleno ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión",
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Llave privada inválida para la aplicación de encriptación. Por favor actualice la clave de la llave privada en las configuraciones personales para recobrar el acceso a sus archivos encriptados.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos.",
-"Your download is being prepared. This might take some time if the files are big." => "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes.",
-"Name" => "Nombre",
-"Size" => "Tamaño",
-"Modified" => "Modificado",
+"{dirs} and {files}" => "{carpetas} y {archivos}",
 "%s could not be renamed" => "No se pudo renombrar %s",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
@@ -65,13 +65,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 significa ilimitado",
 "Maximum input size for ZIP files" => "Tamaño máximo para archivos ZIP de entrada",
 "Save" => "Guardar",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vía WebDAV</a>",
 "New" => "Nuevo",
 "New text file" => "Nuevo archivo de texto",
 "Text file" => "Archivo de texto",
 "New folder" => "Nueva Carpeta",
 "Folder" => "Carpeta",
 "From link" => "Desde enlace",
-"Deleted files" => "Archivos borrados",
 "Cancel upload" => "Cancelar subida",
 "You don’t have permission to upload or create files here" => "No tienes permisos para subir o crear archivos aquí",
 "Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
diff --git a/apps/files/l10n/es_BO.php b/apps/files/l10n/es_BO.php
new file mode 100644
index 0000000000..0157af093e
--- /dev/null
+++ b/apps/files/l10n/es_BO.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/es_CL.php b/apps/files/l10n/es_CL.php
index fa856ad529..bdefea1d8c 100644
--- a/apps/files/l10n/es_CL.php
+++ b/apps/files/l10n/es_CL.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "New folder" => "Nuevo directorio",
+"Cancel upload" => "cancelar subida",
 "Download" => "Descargar"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_CO.php b/apps/files/l10n/es_CO.php
new file mode 100644
index 0000000000..0157af093e
--- /dev/null
+++ b/apps/files/l10n/es_CO.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/es_EC.php b/apps/files/l10n/es_EC.php
new file mode 100644
index 0000000000..0157af093e
--- /dev/null
+++ b/apps/files/l10n/es_EC.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/es_MX.php b/apps/files/l10n/es_MX.php
index f5f773c760..5b88655631 100644
--- a/apps/files/l10n/es_MX.php
+++ b/apps/files/l10n/es_MX.php
@@ -38,24 +38,24 @@ $TRANSLATIONS = array(
 "Share" => "Compartir",
 "Delete permanently" => "Eliminar permanentemente",
 "Rename" => "Renombrar",
+"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.",
+"Pending" => "Pendiente",
 "Error moving file" => "Error moviendo archivo",
 "Error" => "Error",
-"Pending" => "Pendiente",
 "Could not rename file" => "No se pudo renombrar el archivo",
 "Error deleting file." => "Error borrando el archivo.",
+"Name" => "Nombre",
+"Size" => "Tamaño",
+"Modified" => "Modificado",
 "_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
 "_%n file_::_%n files_" => array("%n archivo","%n archivos"),
-"{dirs} and {files}" => "{dirs} y {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"),
 "Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
 "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.",
-"Name" => "Nombre",
-"Size" => "Tamaño",
-"Modified" => "Modificado",
+"{dirs} and {files}" => "{dirs} y {files}",
 "%s could not be renamed" => "%s no pudo ser renombrado",
 "File handling" => "Administración de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
@@ -65,13 +65,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 significa ilimitado",
 "Maximum input size for ZIP files" => "Tamaño máximo para archivos ZIP de entrada",
 "Save" => "Guardar",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vía WebDAV</a>",
 "New" => "Nuevo",
 "New text file" => "Nuevo archivo de texto",
 "Text file" => "Archivo de texto",
 "New folder" => "Nueva carpeta",
 "Folder" => "Carpeta",
 "From link" => "Desde enlace",
-"Deleted files" => "Archivos eliminados",
 "Cancel upload" => "Cancelar subida",
 "You don’t have permission to upload or create files here" => "No tienes permisos para subir o crear archivos aquí.",
 "Nothing in here. Upload something!" => "No hay nada aquí. ¡Suba algo!",
diff --git a/apps/files/l10n/es_PE.php b/apps/files/l10n/es_PE.php
new file mode 100644
index 0000000000..0157af093e
--- /dev/null
+++ b/apps/files/l10n/es_PE.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/es_UY.php b/apps/files/l10n/es_UY.php
new file mode 100644
index 0000000000..0157af093e
--- /dev/null
+++ b/apps/files/l10n/es_UY.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/et_EE.php b/apps/files/l10n/et_EE.php
index 4af93fa9ba..783152aa58 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -42,14 +42,17 @@ $TRANSLATIONS = array(
 "Share" => "Jaga",
 "Delete permanently" => "Kustuta jäädavalt",
 "Rename" => "Nimeta ümber",
+"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. ",
+"Pending" => "Ootel",
 "Error moving file" => "Viga faili eemaldamisel",
 "Error" => "Viga",
-"Pending" => "Ootel",
 "Could not rename file" => "Ei suuda faili ümber nimetada",
 "Error deleting file." => "Viga faili kustutamisel.",
+"Name" => "Nimi",
+"Size" => "Suurus",
+"Modified" => "Muudetud",
 "_%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!",
@@ -57,10 +60,7 @@ $TRANSLATIONS = array(
 "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. ",
-"Name" => "Nimi",
-"Size" => "Suurus",
-"Modified" => "Muudetud",
+"{dirs} and {files}" => "{dirs} ja {files}",
 "%s could not be renamed" => "%s ümbernimetamine ebaõnnestus",
 "Upload (max. %s)" => "Üleslaadimine (max. %s)",
 "File handling" => "Failide käsitlemine",
@@ -71,13 +71,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 tähendab piiramatut",
 "Maximum input size for ZIP files" => "Maksimaalne ZIP-faili sisestatava faili suurus",
 "Save" => "Salvesta",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>",
 "New" => "Uus",
 "New text file" => "Uus tekstifail",
 "Text file" => "Tekstifail",
 "New folder" => "Uus kaust",
 "Folder" => "Kaust",
 "From link" => "Allikast",
-"Deleted files" => "Kustutatud failid",
 "Cancel upload" => "Tühista üleslaadimine",
 "You don’t have permission to upload or create files here" => "Sul puuduvad õigused siia failide üleslaadimiseks või tekitamiseks",
 "Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index e1bb7033eb..c3909ac5da 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -3,7 +3,9 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
 "Could not move %s" => "Ezin dira fitxategiak mugitu %s",
 "File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.",
+"\"%s\" is an invalid file name." => "\"%s\" ez da fitxategi izen baliogarria.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
+"The target folder has been moved or deleted." => "Jatorrizko karpeta mugitu edo ezabatu da.",
 "The name %s is already used in the folder %s. Please choose a different name." => "%s izena dagoeneko erabilita dago %s karpetan. Mesdez hautatu izen ezberdina.",
 "Not a valid source" => "Ez da jatorri baliogarria",
 "Server is not allowed to open URLs, please check the server configuration" => "Zerbitzaria ez dago URLak irekitzeko baimendua, mesedez egiaztatu zerbitzariaren konfigurazioa",
@@ -27,6 +29,8 @@ $TRANSLATIONS = array(
 "Invalid directory." => "Baliogabeko karpeta.",
 "Files" => "Fitxategiak",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako",
+"Total file size {size1} exceeds upload limit {size2}" => "Fitxategiaren tamainak {size1} igotzeko muga {size2} gainditzen du",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Ez dago leku nahikorik, zu {size1} igotzen ari zara baina bakarrik {size2} libre dago",
 "Upload cancelled." => "Igoera ezeztatuta",
 "Could not get result from server." => "Ezin da zerbitzaritik emaitzik lortu",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
@@ -38,25 +42,28 @@ $TRANSLATIONS = array(
 "Share" => "Elkarbanatu",
 "Delete permanently" => "Ezabatu betirako",
 "Rename" => "Berrizendatu",
+"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. ",
+"Pending" => "Zain",
+"Error moving file." => "Errorea fitxategia mugitzean.",
 "Error moving file" => "Errorea fitxategia mugitzean",
 "Error" => "Errorea",
-"Pending" => "Zain",
 "Could not rename file" => "Ezin izan da fitxategia berrizendatu",
 "Error deleting file." => "Errorea fitxategia ezabatzerakoan.",
+"Name" => "Izena",
+"Size" => "Tamaina",
+"Modified" => "Aldatuta",
 "_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"),
 "_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"),
-"{dirs} and {files}" => "{dirs} eta {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Fitxategi %n igotzen","%n fitxategi igotzen"),
+"\"{name}\" is an invalid file name." => "\"{name}\" ez da fitxategi izen baliogarria.",
 "Your storage is full, files can not be updated or synced anymore!" => "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
 "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. ",
-"Name" => "Izena",
-"Size" => "Tamaina",
-"Modified" => "Aldatuta",
+"{dirs} and {files}" => "{dirs} eta {files}",
 "%s could not be renamed" => "%s ezin da berrizendatu",
+"Upload (max. %s)" => "Igo (max. %s)",
 "File handling" => "Fitxategien kudeaketa",
 "Maximum upload size" => "Igo daitekeen gehienezko tamaina",
 "max. possible: " => "max, posiblea:",
@@ -65,13 +72,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 mugarik gabe esan nahi du",
 "Maximum input size for ZIP files" => "ZIP fitxategien gehienezko tamaina",
 "Save" => "Gorde",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>",
 "New" => "Berria",
 "New text file" => "Testu fitxategi berria",
 "Text file" => "Testu fitxategia",
 "New folder" => "Karpeta berria",
 "Folder" => "Karpeta",
 "From link" => "Estekatik",
-"Deleted files" => "Ezabatutako fitxategiak",
 "Cancel upload" => "Ezeztatu igoera",
 "You don’t have permission to upload or create files here" => "Ez duzu fitxategiak hona igotzeko edo hemen sortzeko baimenik",
 "Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 4d2a929195..01f2905366 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -23,17 +23,17 @@ $TRANSLATIONS = array(
 "Share" => "اشتراک‌گذاری",
 "Delete permanently" => "حذف قطعی",
 "Rename" => "تغییرنام",
-"Error" => "خطا",
+"Your download is being prepared. This might take some time if the files are big." => "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد.",
 "Pending" => "در انتظار",
+"Error" => "خطا",
+"Name" => "نام",
+"Size" => "اندازه",
+"Modified" => "تاریخ",
 "_%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." => "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد.",
-"Name" => "نام",
-"Size" => "اندازه",
-"Modified" => "تاریخ",
 "%s could not be renamed" => "%s نمیتواند تغییر نام دهد.",
 "File handling" => "اداره پرونده ها",
 "Maximum upload size" => "حداکثر اندازه بارگزاری",
@@ -43,12 +43,13 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 نامحدود است",
 "Maximum input size for ZIP files" => "حداکثرمقدار برای بار گزاری پرونده های فشرده",
 "Save" => "ذخیره",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "از این آدرس استفاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به فایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>",
 "New" => "جدید",
 "Text file" => "فایل متنی",
 "New folder" => "پوشه جدید",
 "Folder" => "پوشه",
 "From link" => "از پیوند",
-"Deleted files" => "فایل های حذف شده",
 "Cancel upload" => "متوقف کردن بار گذاری",
 "Nothing in here. Upload something!" => "اینجا هیچ چیز نیست.",
 "Download" => "دانلود",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index ba3c921dfe..c25fe7e1e2 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -27,6 +27,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty.",
 "Invalid directory." => "Virheellinen kansio.",
 "Files" => "Tiedostot",
+"All files" => "Kaikki tiedostot",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua",
 "Total file size {size1} exceeds upload limit {size2}" => "Yhteiskoko {size1} ylittää lähetysrajan {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä",
@@ -41,14 +42,18 @@ $TRANSLATIONS = array(
 "Share" => "Jaa",
 "Delete permanently" => "Poista pysyvästi",
 "Rename" => "Nimeä uudelleen",
+"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.",
+"Pending" => "Odottaa",
+"Error moving file." => "Virhe tiedostoa siirrettäessä.",
 "Error moving file" => "Virhe tiedostoa siirrettäessä",
 "Error" => "Virhe",
-"Pending" => "Odottaa",
 "Could not rename file" => "Tiedoston nimeäminen uudelleen epäonnistui",
 "Error deleting file." => "Virhe tiedostoa poistaessa.",
+"Name" => "Nimi",
+"Size" => "Koko",
+"Modified" => "Muokattu",
 "_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"),
 "_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"),
-"{dirs} and {files}" => "{dirs} ja {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Lähetetään %n tiedosto","Lähetetään %n tiedostoa"),
 "\"{name}\" is an invalid file name." => "\"{name}\" on virheellinen tiedostonimi.",
 "Your storage is full, files can not be updated or synced anymore!" => "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!",
@@ -56,10 +61,7 @@ $TRANSLATIONS = array(
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Salaussovelluksen salausavain on virheellinen. Ole hyvä ja päivitä salausavain henkilökohtaisissa asetuksissasi jotta voit taas avata salatuskirjoitetut tiedostosi.",
 "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.",
-"Name" => "Nimi",
-"Size" => "Koko",
-"Modified" => "Muokattu",
+"{dirs} and {files}" => "{dirs} ja {files}",
 "%s could not be renamed" => "kohteen %s nimeäminen uudelleen epäonnistui",
 "Upload (max. %s)" => "Lähetys (enintään %s)",
 "File handling" => "Tiedostonhallinta",
@@ -70,13 +72,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 on rajoittamaton",
 "Maximum input size for ZIP files" => "ZIP-tiedostojen enimmäiskoko",
 "Save" => "Tallenna",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\">käyttääksesi tiedostojasi WebDAVin kautta</a>",
 "New" => "Uusi",
 "New text file" => "Uusi tekstitiedosto",
 "Text file" => "Tekstitiedosto",
 "New folder" => "Uusi kansio",
 "Folder" => "Kansio",
 "From link" => "Linkistä",
-"Deleted files" => "Poistetut tiedostot",
 "Cancel upload" => "Peru lähetys",
 "You don’t have permission to upload or create files here" => "Käyttöoikeutesi eivät riitä tiedostojen lähettämiseen tai kansioiden luomiseen tähän sijaintiin",
 "Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 26ba8445f4..1ddb94d083 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -42,14 +42,18 @@ $TRANSLATIONS = array(
 "Share" => "Partager",
 "Delete permanently" => "Supprimer de façon définitive",
 "Rename" => "Renommer",
+"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.",
+"Pending" => "En attente",
+"Error moving file." => "Erreur lors du déplacement du fichier.",
 "Error moving file" => "Erreur lors du déplacement du fichier",
 "Error" => "Erreur",
-"Pending" => "En attente",
 "Could not rename file" => "Impossible de renommer le fichier",
 "Error deleting file." => "Erreur pendant la suppression du fichier.",
+"Name" => "Nom",
+"Size" => "Taille",
+"Modified" => "Modifié",
 "_%n folder_::_%n folders_" => array("%n dossier","%n dossiers"),
 "_%n file_::_%n files_" => array("%n fichier","%n fichiers"),
-"{dirs} and {files}" => "{dirs} et {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Téléversement de %n fichier","Téléversement de %n fichiers"),
 "\"{name}\" is an invalid file name." => "\"{name}\" n'est pas un nom de fichier valide.",
 "Your storage is full, files can not be updated or synced anymore!" => "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !",
@@ -57,10 +61,7 @@ $TRANSLATIONS = array(
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "L'application de chiffrement est activée mais vos clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter.",
 "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.",
-"Name" => "Nom",
-"Size" => "Taille",
-"Modified" => "Modifié",
+"{dirs} and {files}" => "{dirs} et {files}",
 "%s could not be renamed" => "%s ne peut être renommé",
 "Upload (max. %s)" => "Envoi (max. %s)",
 "File handling" => "Gestion des fichiers",
@@ -71,13 +72,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 est illimité",
 "Maximum input size for ZIP files" => "Taille maximale pour les fichiers ZIP",
 "Save" => "Sauvegarder",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utiliser cette adresse pour <a href=\"%s\" target=\"_blank\"> accéder à vos fichiers par WebDAV</a>",
 "New" => "Nouveau",
 "New text file" => "Nouveau fichier texte",
 "Text file" => "Fichier texte",
 "New folder" => "Nouveau dossier",
 "Folder" => "Dossier",
 "From link" => "Depuis le lien",
-"Deleted files" => "Fichiers supprimés",
 "Cancel upload" => "Annuler l'envoi",
 "You don’t have permission to upload or create files here" => "Vous n'avez pas la permission de téléverser ou de créer des fichiers ici",
 "Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index d9c6d00360..98a3a73b29 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "O envío fracasou. Non foi posíbel obter información do ficheiro.",
 "Invalid directory." => "O directorio é incorrecto.",
 "Files" => "Ficheiros",
+"All files" => "Todos os ficheiros",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes",
 "Total file size {size1} exceeds upload limit {size2}" => "O tamaño total do ficheiro {size1} excede do límite de envío {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "Non hai espazo libre abondo, o seu envío é de {size1} mais só dispón de {size2}",
@@ -42,14 +43,18 @@ $TRANSLATIONS = array(
 "Share" => "Compartir",
 "Delete permanently" => "Eliminar permanentemente",
 "Rename" => "Renomear",
+"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.",
+"Pending" => "Pendentes",
+"Error moving file." => "Produciuse un erro ao mover o ficheiro.",
 "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",
 "Error deleting file." => "Produciuse un erro ao eliminar o ficheiro.",
+"Name" => "Nome",
+"Size" => "Tamaño",
+"Modified" => "Modificado",
 "_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"),
 "_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
-"{dirs} and {files}" => "{dirs} e {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Cargando %n ficheiro","Cargando %n ficheiros"),
 "\"{name}\" is an invalid file name." => "«{name}» é un nome incorrecto de ficheiro.",
 "Your storage is full, files can not be updated or synced anymore!" => "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!",
@@ -57,10 +62,7 @@ $TRANSLATIONS = array(
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "O aplicativo de cifrado está activado, mais as chaves non foron inicializadas, saia da sesión e volva a acceder de novo",
 "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.",
-"Name" => "Nome",
-"Size" => "Tamaño",
-"Modified" => "Modificado",
+"{dirs} and {files}" => "{dirs} e {files}",
 "%s could not be renamed" => "%s non pode cambiar de nome",
 "Upload (max. %s)" => "Envío (máx. %s)",
 "File handling" => "Manexo de ficheiro",
@@ -71,13 +73,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 significa ilimitado",
 "Maximum input size for ZIP files" => "Tamaño máximo de descarga para os ficheiros ZIP",
 "Save" => "Gardar",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Empregue esta ligazón para  <a href=\"%s\" target=\"_blank\">acceder aos seus ficheiros mediante WebDAV</a>",
 "New" => "Novo",
 "New text file" => "Ficheiro novo de texto",
 "Text file" => "Ficheiro de texto",
 "New folder" => "Novo cartafol",
 "Folder" => "Cartafol",
 "From link" => "Desde a ligazón",
-"Deleted files" => "Ficheiros eliminados",
 "Cancel upload" => "Cancelar o envío",
 "You don’t have permission to upload or create files here" => "Non ten permisos para enviar ou crear ficheiros aquí.",
 "Nothing in here. Upload something!" => "Aquí non hai nada. Envíe algo.",
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 6279e675db..e69599694e 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -23,15 +23,15 @@ $TRANSLATIONS = array(
 "Share" => "שתף",
 "Delete permanently" => "מחק לצמיתות",
 "Rename" => "שינוי שם",
-"Error" => "שגיאה",
 "Pending" => "ממתין",
+"Error" => "שגיאה",
+"Name" => "שם",
+"Size" => "גודל",
+"Modified" => "זמן שינוי",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Your storage is almost full ({usedSpacePercent}%)" => "שטח האחסון שלך כמעט מלא ({usedSpacePercent}%)",
-"Name" => "שם",
-"Size" => "גודל",
-"Modified" => "זמן שינוי",
 "File handling" => "טיפול בקבצים",
 "Maximum upload size" => "גודל העלאה מקסימלי",
 "max. possible: " => "המרבי האפשרי: ",
@@ -40,11 +40,11 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 - ללא הגבלה",
 "Maximum input size for ZIP files" => "גודל הקלט המרבי לקובצי ZIP",
 "Save" => "שמירה",
+"WebDAV" => "WebDAV",
 "New" => "חדש",
 "Text file" => "קובץ טקסט",
 "Folder" => "תיקייה",
 "From link" => "מקישור",
-"Deleted files" => "קבצים שנמחקו",
 "Cancel upload" => "ביטול ההעלאה",
 "Nothing in here. Upload something!" => "אין כאן שום דבר. אולי ברצונך להעלות משהו?",
 "Download" => "הורדה",
diff --git a/apps/files/l10n/hi_IN.php b/apps/files/l10n/hi_IN.php
new file mode 100644
index 0000000000..0157af093e
--- /dev/null
+++ b/apps/files/l10n/hi_IN.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/hr.php b/apps/files/l10n/hr.php
index 0876dcdd1e..4e8deeed51 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -11,14 +11,14 @@ $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",
-"_%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",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "File handling" => "datoteka za rukovanje",
 "Maximum upload size" => "Maksimalna veličina prijenosa",
 "max. possible: " => "maksimalna moguća: ",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 9ed0032682..89264c0c52 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -38,24 +38,24 @@ $TRANSLATIONS = array(
 "Share" => "Megosztás",
 "Delete permanently" => "Végleges törlés",
 "Rename" => "Átnevezés",
+"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.",
+"Pending" => "Folyamatban",
 "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",
 "Error deleting file." => "Hiba a file törlése közben.",
+"Name" => "Név",
+"Size" => "Méret",
+"Modified" => "Módosítva",
 "_%n folder_::_%n folders_" => array("%n mappa","%n mappa"),
 "_%n file_::_%n files_" => array("%n állomány","%n állomány"),
-"{dirs} and {files}" => "{dirs} és {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n állomány feltöltése","%n állomány feltöltése"),
 "Your storage is full, files can not be updated or synced anymore!" => "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben.",
 "Your storage is almost full ({usedSpacePercent}%)" => "A tároló majdnem tele van ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!",
 "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.",
-"Name" => "Név",
-"Size" => "Méret",
-"Modified" => "Módosítva",
+"{dirs} and {files}" => "{dirs} és {files}",
 "%s could not be renamed" => "%s átnevezése nem sikerült",
 "File handling" => "Fájlkezelés",
 "Maximum upload size" => "Maximális feltölthető fájlméret",
@@ -65,13 +65,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 = korlátlan",
 "Maximum input size for ZIP files" => "ZIP-fájlok maximális kiindulási mérete",
 "Save" => "Mentés",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Ezt a címet használd, hogy <a href=\"%s\" target=\"_blank\">hozzáférj a fileokhoz WebDAV-on keresztül</a>",
 "New" => "Új",
 "New text file" => "Új szöveges file",
 "Text file" => "Szövegfájl",
 "New folder" => "Új mappa",
 "Folder" => "Mappa",
 "From link" => "Feltöltés linkről",
-"Deleted files" => "Törölt fájlok",
 "Cancel upload" => "A feltöltés megszakítása",
 "You don’t have permission to upload or create files here" => "Önnek nincs jogosultsága ahhoz, hogy ide állományokat töltsön föl, vagy itt újakat hozzon létre",
 "Nothing in here. Upload something!" => "Itt nincs semmi. Töltsön fel valamit!",
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index ff4cb0225b..51d433258b 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -6,12 +6,12 @@ $TRANSLATIONS = array(
 "Files" => "Files",
 "Share" => "Compartir",
 "Error" => "Error",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "Nomine",
 "Size" => "Dimension",
 "Modified" => "Modificate",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Maximum upload size" => "Dimension maxime de incargamento",
 "Save" => "Salveguardar",
 "New" => "Nove",
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index d8c0a47789..4e9852cd18 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -36,24 +36,24 @@ $TRANSLATIONS = array(
 "Share" => "Bagikan",
 "Delete permanently" => "Hapus secara permanen",
 "Rename" => "Ubah nama",
+"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.",
+"Pending" => "Menunggu",
 "Error moving file" => "Galat saat memindahkan berkas",
 "Error" => "Galat",
-"Pending" => "Menunggu",
 "Could not rename file" => "Tidak dapat mengubah nama berkas",
 "Error deleting file." => "Galat saat menghapus berkas.",
+"Name" => "Nama",
+"Size" => "Ukuran",
+"Modified" => "Dimodifikasi",
 "_%n folder_::_%n folders_" => array("%n folder"),
 "_%n file_::_%n files_" => array("%n berkas"),
-"{dirs} and {files}" => "{dirs} dan {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Mengunggah %n berkas"),
 "Your storage is full, files can not be updated or synced anymore!" => "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
 "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.",
-"Name" => "Nama",
-"Size" => "Ukuran",
-"Modified" => "Dimodifikasi",
+"{dirs} and {files}" => "{dirs} dan {files}",
 "%s could not be renamed" => "%s tidak dapat diubah nama",
 "File handling" => "Penanganan berkas",
 "Maximum upload size" => "Ukuran pengunggahan maksimum",
@@ -63,13 +63,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 berarti tidak terbatas",
 "Maximum input size for ZIP files" => "Ukuran masukan maksimum untuk berkas ZIP",
 "Save" => "Simpan",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses Berkas via WebDAV</a>",
 "New" => "Baru",
 "New text file" => "Berkas teks baru",
 "Text file" => "Berkas teks",
 "New folder" => "Map baru",
 "Folder" => "Folder",
 "From link" => "Dari tautan",
-"Deleted files" => "Berkas yang dihapus",
 "Cancel upload" => "Batal pengunggahan",
 "You don’t have permission to upload or create files here" => "Anda tidak memiliki akses untuk mengunggah atau membuat berkas disini",
 "Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index b8e23b6a30..982c6f3742 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -19,14 +19,14 @@ $TRANSLATIONS = array(
 "{new_name} already exists" => "{new_name} er þegar til",
 "Share" => "Deila",
 "Rename" => "Endurskýra",
-"Error" => "Villa",
 "Pending" => "Bíður",
-"_%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",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "File handling" => "Meðhöndlun skrár",
 "Maximum upload size" => "Hámarks stærð innsendingar",
 "max. possible: " => "hámark mögulegt: ",
@@ -35,6 +35,7 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 er ótakmarkað",
 "Maximum input size for ZIP files" => "Hámarks inntaksstærð fyrir ZIP skrár",
 "Save" => "Vista",
+"WebDAV" => "WebDAV",
 "New" => "Nýtt",
 "Text file" => "Texta skrá",
 "Folder" => "Mappa",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index c77fb57c59..e4fed8fd2f 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "Caricamento non riuscito. Impossibile ottenere informazioni sul file.",
 "Invalid directory." => "Cartella non valida.",
 "Files" => "File",
+"All files" => "Tutti i file",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.",
 "Total file size {size1} exceeds upload limit {size2}" => "La dimensione totale del file {size1} supera il limite di caricamento {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}",
@@ -42,14 +43,18 @@ $TRANSLATIONS = array(
 "Share" => "Condividi",
 "Delete permanently" => "Elimina definitivamente",
 "Rename" => "Rinomina",
+"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.",
+"Pending" => "In corso",
+"Error moving file." => "Errore durante lo spostamento del file.",
 "Error moving file" => "Errore durante lo spostamento del file",
 "Error" => "Errore",
-"Pending" => "In corso",
 "Could not rename file" => "Impossibile rinominare il file",
 "Error deleting file." => "Errore durante l'eliminazione del file.",
+"Name" => "Nome",
+"Size" => "Dimensione",
+"Modified" => "Modificato",
 "_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"),
 "_%n file_::_%n files_" => array("%n file","%n file"),
-"{dirs} and {files}" => "{dirs} e {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Caricamento di %n file in corso","Caricamento di %n file in corso"),
 "\"{name}\" is an invalid file name." => "\"{name}\" non è un nome file valido.",
 "Your storage is full, files can not be updated or synced anymore!" => "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!",
@@ -57,10 +62,7 @@ $TRANSLATIONS = array(
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
 "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.",
-"Name" => "Nome",
-"Size" => "Dimensione",
-"Modified" => "Modificato",
+"{dirs} and {files}" => "{dirs} e {files}",
 "%s could not be renamed" => "%s non può essere rinominato",
 "Upload (max. %s)" => "Carica (massimo %s)",
 "File handling" => "Gestione file",
@@ -71,13 +73,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 è illimitato",
 "Maximum input size for ZIP files" => "Dimensione massima per i file ZIP",
 "Save" => "Salva",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\">accedere ai tuoi file con WebDAV</a>",
 "New" => "Nuovo",
 "New text file" => "Nuovo file di testo",
 "Text file" => "File di testo",
 "New folder" => "Nuova cartella",
 "Folder" => "Cartella",
 "From link" => "Da collegamento",
-"Deleted files" => "File eliminati",
 "Cancel upload" => "Annulla invio",
 "You don’t have permission to upload or create files here" => "Qui non hai i permessi di caricare o creare file",
 "Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
diff --git a/apps/files/l10n/ja.php b/apps/files/l10n/ja.php
index 361fd835ce..dfbc590d0a 100644
--- a/apps/files/l10n/ja.php
+++ b/apps/files/l10n/ja.php
@@ -42,14 +42,18 @@ $TRANSLATIONS = array(
 "Share" => "共有",
 "Delete permanently" => "完全に削除する",
 "Rename" => "名前の変更",
+"Your download is being prepared. This might take some time if the files are big." => "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。",
+"Pending" => "中断",
+"Error moving file." => "ファイル移動でエラー",
 "Error moving file" => "ファイルの移動エラー",
 "Error" => "エラー",
-"Pending" => "中断",
 "Could not rename file" => "ファイルの名前変更ができませんでした",
 "Error deleting file." => "ファイルの削除エラー。",
+"Name" => "名前",
+"Size" => "サイズ",
+"Modified" => "更新日時",
 "_%n folder_::_%n folders_" => array("%n 個のフォルダー"),
 "_%n file_::_%n files_" => array("%n 個のファイル"),
-"{dirs} and {files}" => "{dirs} と {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n 個のファイルをアップロード中"),
 "\"{name}\" is an invalid file name." => "\"{name}\" は無効なファイル名です。",
 "Your storage is full, files can not be updated or synced anymore!" => "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！",
@@ -57,11 +61,9 @@ $TRANSLATIONS = array(
 "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." => "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。",
-"Name" => "名前",
-"Size" => "サイズ",
-"Modified" => "更新日時",
+"{dirs} and {files}" => "{dirs} と {files}",
 "%s could not be renamed" => "%sの名前を変更できませんでした",
+"Upload (max. %s)" => "アップロード ( 最大 %s )",
 "File handling" => "ファイル操作",
 "Maximum upload size" => "最大アップロードサイズ",
 "max. possible: " => "最大容量: ",
@@ -70,13 +72,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0を指定した場合は無制限",
 "Maximum input size for ZIP files" => "ZIPファイルでの最大入力サイズ",
 "Save" => "保存",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">WebDAV 経由でファイルにアクセス</a> するにはこのアドレスを利用してください",
 "New" => "新規作成",
 "New text file" => "新規のテキストファイル作成",
 "Text file" => "テキストファイル",
 "New folder" => "新しいフォルダー",
 "Folder" => "フォルダー",
 "From link" => "リンク",
-"Deleted files" => "ゴミ箱",
 "Cancel upload" => "アップロードをキャンセル",
 "You don’t have permission to upload or create files here" => "ここにファイルをアップロードもしくは作成する権限がありません",
 "Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index ad3a4bff1f..b13a6ac23c 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -21,17 +21,17 @@ $TRANSLATIONS = array(
 "Share" => "გაზიარება",
 "Delete permanently" => "სრულად წაშლა",
 "Rename" => "გადარქმევა",
-"Error" => "შეცდომა",
+"Your download is being prepared. This might take some time if the files are big." => "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის.",
 "Pending" => "მოცდის რეჟიმში",
+"Error" => "შეცდომა",
+"Name" => "სახელი",
+"Size" => "ზომა",
+"Modified" => "შეცვლილია",
 "_%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." => "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის.",
-"Name" => "სახელი",
-"Size" => "ზომა",
-"Modified" => "შეცვლილია",
 "File handling" => "ფაილის დამუშავება",
 "Maximum upload size" => "მაქსიმუმ ატვირთის ზომა",
 "max. possible: " => "მაქს. შესაძლებელი:",
@@ -40,12 +40,12 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 is unlimited",
 "Maximum input size for ZIP files" => "ZIP ფაილების მაქსიმუმ დასაშვები ზომა",
 "Save" => "შენახვა",
+"WebDAV" => "WebDAV",
 "New" => "ახალი",
 "Text file" => "ტექსტური ფაილი",
 "New folder" => "ახალი ფოლდერი",
 "Folder" => "საქაღალდე",
 "From link" => "მისამართიდან",
-"Deleted files" => "წაშლილი ფაილები",
 "Cancel upload" => "ატვირთვის გაუქმება",
 "Nothing in here. Upload something!" => "აქ არაფერი არ არის. ატვირთე რამე!",
 "Download" => "ჩამოტვირთვა",
diff --git a/apps/files/l10n/km.php b/apps/files/l10n/km.php
index 30bb2998af..3cfb33854b 100644
--- a/apps/files/l10n/km.php
+++ b/apps/files/l10n/km.php
@@ -1,17 +1,37 @@
 <?php
 $TRANSLATIONS = array(
+"File name cannot be empty." => "ឈ្មោះ​ឯកសារ​មិន​អាច​នៅ​ទទេ​បាន​ឡើយ។",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ឈ្មោះ​មិន​ត្រឹម​ត្រូវ, មិន​អនុញ្ញាត '\\', '/', '<', '>', ':', '\"', '|', '?' និង '*' ទេ។",
 "Files" => "ឯកសារ",
+"Upload cancelled." => "បាន​បោះបង់​ការ​ផ្ទុក​ឡើង។",
+"{new_name} already exists" => "មាន​ឈ្មោះ {new_name} រួច​ហើយ",
 "Share" => "ចែក​រំលែក",
+"Delete permanently" => "លុប​ជា​អចិន្ត្រៃយ៍",
+"Rename" => "ប្ដូរ​ឈ្មោះ",
+"Your download is being prepared. This might take some time if the files are big." => "ការ​ទាញយក​របស់​អ្នក​កំពុង​ត្រូវ​បាន​រៀបចំ​ហើយ។ នេះ​អាច​ចំណាយ​ពេល​មួយ​សំទុះ ប្រសិន​បើ​ឯកសារ​ធំ។",
+"Pending" => "កំពុង​រង់ចាំ",
 "Error" => "កំហុស",
+"Name" => "ឈ្មោះ",
+"Size" => "ទំហំ",
+"Modified" => "បាន​កែ​ប្រែ",
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
-"Name" => "ឈ្មោះ",
-"Size" => "ទំហំ",
+"Maximum upload size" => "ទំហំ​ផ្ទុកឡើង​ជា​អតិបរមា",
+"Enable ZIP-download" => "បើក​ការ​ទាញយក​ជា ZIP",
+"0 is unlimited" => "0 គឺ​មិន​កំណត់",
+"Maximum input size for ZIP files" => "ទំហំ​ចូល​ជា​អតិបរមា​សម្រាប់​ឯកសារ ZIP",
 "Save" => "រក្សាទុក",
+"WebDAV" => "WebDAV",
+"New" => "ថ្មី",
+"Text file" => "ឯកសារ​អក្សរ",
 "New folder" => "ថត​ថ្មី",
 "Folder" => "ថត",
+"From link" => "ពី​តំណ",
+"Cancel upload" => "បោះបង់​ការ​ផ្ទុកឡើង",
+"Nothing in here. Upload something!" => "គ្មាន​អ្វី​នៅ​ទីនេះ​ទេ។ ផ្ទុក​ឡើង​អ្វី​មួយ!",
 "Download" => "ទាញយក",
-"Delete" => "លុប"
+"Delete" => "លុប",
+"Upload too large" => "ផ្ទុក​ឡើង​ធំ​ពេក"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index 21c7ebcdc4..ae885bb7a3 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -38,24 +38,24 @@ $TRANSLATIONS = array(
 "Share" => "공유",
 "Delete permanently" => "영구히 삭제",
 "Rename" => "이름 바꾸기",
+"Your download is being prepared. This might take some time if the files are big." => "다운로드 준비 중입니다. 파일 크기가 크면 시간이 오래 걸릴 수도 있습니다.",
+"Pending" => "대기 중",
 "Error moving file" => "파일 이동 오류",
 "Error" => "오류",
-"Pending" => "대기 중",
 "Could not rename file" => "이름을 변경할 수 없음",
 "Error deleting file." => "파일 삭제 오류.",
+"Name" => "이름",
+"Size" => "크기",
+"Modified" => "수정됨",
 "_%n folder_::_%n folders_" => array("폴더 %n개"),
 "_%n file_::_%n files_" => array("파일 %n개"),
-"{dirs} and {files}" => "{dirs} 그리고 {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("파일 %n개 업로드 중"),
 "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." => "다운로드 준비 중입니다. 파일 크기가 크면 시간이 오래 걸릴 수도 있습니다.",
-"Name" => "이름",
-"Size" => "크기",
-"Modified" => "수정됨",
+"{dirs} and {files}" => "{dirs} 그리고 {files}",
 "%s could not be renamed" => "%s의 이름을 변경할 수 없습니다",
 "File handling" => "파일 처리",
 "Maximum upload size" => "최대 업로드 크기",
@@ -65,13 +65,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0은 무제한입니다",
 "Maximum input size for ZIP files" => "ZIP 파일 최대 크기",
 "Save" => "저장",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "WebDAV로 파일에 접근하려면 <a href=\"%s\" target=\"_blank\">이 주소를 사용하십시오</a>",
 "New" => "새로 만들기",
 "New text file" => "새 텍스트 파일",
 "Text file" => "텍스트 파일",
 "New folder" => "새 폴더",
 "Folder" => "폴더",
 "From link" => "링크에서",
-"Deleted files" => "삭제된 파일",
 "Cancel upload" => "업로드 취소",
 "You don’t have permission to upload or create files here" => "여기에 파일을 업로드하거나 만들 권한이 없습니다",
 "Nothing in here. Upload something!" => "내용이 없습니다. 업로드할 수 있습니다!",
diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php
index 1c9d615ee7..4afe5e4cc2 100644
--- a/apps/files/l10n/ku_IQ.php
+++ b/apps/files/l10n/ku_IQ.php
@@ -3,10 +3,10 @@ $TRANSLATIONS = array(
 "Files" => "په‌ڕگەکان",
 "Share" => "هاوبەشی کردن",
 "Error" => "هه‌ڵه",
+"Name" => "ناو",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Name" => "ناو",
 "Save" => "پاشکه‌وتکردن",
 "Folder" => "بوخچه",
 "Download" => "داگرتن"
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index 27dc936600..b742be43c3 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -12,12 +12,12 @@ $TRANSLATIONS = array(
 "Share" => "Deelen",
 "Rename" => "Ëm-benennen",
 "Error" => "Fehler",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "Numm",
 "Size" => "Gréisst",
 "Modified" => "Geännert",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "File handling" => "Fichier handling",
 "Maximum upload size" => "Maximum Upload Gréisst ",
 "max. possible: " => "max. méiglech:",
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index a8c30016d3..f6fa6514c5 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -38,24 +38,24 @@ $TRANSLATIONS = array(
 "Share" => "Dalintis",
 "Delete permanently" => "Ištrinti negrįžtamai",
 "Rename" => "Pervadinti",
+"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.",
+"Pending" => "Laukiantis",
 "Error moving file" => "Klaida perkeliant failą",
 "Error" => "Klaida",
-"Pending" => "Laukiantis",
 "Could not rename file" => "Neįmanoma pervadinti failo",
 "Error deleting file." => "Klaida trinant failą.",
+"Name" => "Pavadinimas",
+"Size" => "Dydis",
+"Modified" => "Pakeista",
 "_%n folder_::_%n folders_" => array("%n aplankas","%n aplankai","%n aplankų"),
 "_%n file_::_%n files_" => array("%n failas","%n failai","%n failų"),
-"{dirs} and {files}" => "{dirs} ir {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Įkeliamas %n failas","Įkeliami %n failai","Įkeliama %n failų"),
 "Your storage is full, files can not be updated or synced anymore!" => "Jūsų visa vieta serveryje užimta",
 "Your storage is almost full ({usedSpacePercent}%)" => "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti",
 "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.",
-"Name" => "Pavadinimas",
-"Size" => "Dydis",
-"Modified" => "Pakeista",
+"{dirs} and {files}" => "{dirs} ir {files}",
 "%s could not be renamed" => "%s negali būti pervadintas",
 "File handling" => "Failų tvarkymas",
 "Maximum upload size" => "Maksimalus įkeliamo failo dydis",
@@ -65,13 +65,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 yra neribotas",
 "Maximum input size for ZIP files" => "Maksimalus ZIP archyvo failo dydis",
 "Save" => "Išsaugoti",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Naudokite šį adresą, kad <a href=\"%s\" target=\"_blank\">pasiektumėte savo failus per WebDAV</a>",
 "New" => "Naujas",
 "New text file" => "Naujas tekstinis failas",
 "Text file" => "Teksto failas",
 "New folder" => "Naujas aplankas",
 "Folder" => "Katalogas",
 "From link" => "Iš nuorodos",
-"Deleted files" => "Ištrinti failai",
 "Cancel upload" => "Atšaukti siuntimą",
 "You don’t have permission to upload or create files here" => "Jūs neturite leidimo čia įkelti arba kurti failus",
 "Nothing in here. Upload something!" => "Čia tuščia. Įkelkite ką nors!",
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 71f3976816..970e960384 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -23,18 +23,18 @@ $TRANSLATIONS = array(
 "Share" => "Dalīties",
 "Delete permanently" => "Dzēst pavisam",
 "Rename" => "Pārsaukt",
-"Error" => "Kļūda",
+"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.",
 "Pending" => "Gaida savu kārtu",
+"Error" => "Kļūda",
+"Name" => "Nosaukums",
+"Size" => "Izmērs",
+"Modified" => "Mainīts",
 "_%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"),
 "Your storage is full, files can not be updated or synced anymore!" => "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos.",
-"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.",
-"Name" => "Nosaukums",
-"Size" => "Izmērs",
-"Modified" => "Mainīts",
 "%s could not be renamed" => "%s nevar tikt pārsaukts",
 "File handling" => "Datņu pārvaldība",
 "Maximum upload size" => "Maksimālais datņu augšupielādes apjoms",
@@ -44,12 +44,12 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 ir neierobežots",
 "Maximum input size for ZIP files" => "Maksimālais ievades izmērs ZIP datnēm",
 "Save" => "Saglabāt",
+"WebDAV" => "WebDAV",
 "New" => "Jauna",
 "Text file" => "Teksta datne",
 "New folder" => "Jauna mape",
 "Folder" => "Mape",
 "From link" => "No saites",
-"Deleted files" => "Dzēstās datnes",
 "Cancel upload" => "Atcelt augšupielādi",
 "Nothing in here. Upload something!" => "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!",
 "Download" => "Lejupielādēt",
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index e1ff2c0bc2..293756282c 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -33,20 +33,20 @@ $TRANSLATIONS = array(
 "Share" => "Сподели",
 "Delete permanently" => "Трајно избришани",
 "Rename" => "Преименувај",
+"Your download is being prepared. This might take some time if the files are big." => "Вашето преземање се подготвува. Ова може да потрае до колку датотеките се големи.",
+"Pending" => "Чека",
 "Error moving file" => "Грешка при префрлање на датотека",
 "Error" => "Грешка",
-"Pending" => "Чека",
 "Could not rename file" => "Не можам да ја преименувам датотеката",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"{dirs} and {files}" => "{dirs} и {files}",
-"_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." => "Вашето преземање се подготвува. Ова може да потрае до колку датотеките се големи.",
 "Name" => "Име",
 "Size" => "Големина",
 "Modified" => "Променето",
+"_%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}%)",
+"{dirs} and {files}" => "{dirs} и {files}",
 "%s could not be renamed" => "%s не може да биде преименуван",
 "File handling" => "Ракување со датотеки",
 "Maximum upload size" => "Максимална големина за подигање",
@@ -56,11 +56,11 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 е неограничено",
 "Maximum input size for ZIP files" => "Максимална големина за внес на ZIP датотеки",
 "Save" => "Сними",
+"WebDAV" => "WebDAV",
 "New" => "Ново",
 "Text file" => "Текстуална датотека",
 "Folder" => "Папка",
 "From link" => "Од врска",
-"Deleted files" => "Избришани датотеки",
 "Cancel upload" => "Откажи прикачување",
 "Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!",
 "Download" => "Преземи",
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index af42a3838b..81d3de6299 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -11,14 +11,14 @@ $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",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "File handling" => "Pengendalian fail",
 "Maximum upload size" => "Saiz maksimum muat naik",
 "max. possible: " => "maksimum:",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 9887087cca..81f96a81c4 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -38,24 +38,24 @@ $TRANSLATIONS = array(
 "Share" => "Del",
 "Delete permanently" => "Slett permanent",
 "Rename" => "Gi nytt navn",
+"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.",
+"Pending" => "Ventende",
 "Error moving file" => "Feil ved flytting av fil",
 "Error" => "Feil",
-"Pending" => "Ventende",
 "Could not rename file" => "Klarte ikke å gi nytt navn til fil",
 "Error deleting file." => "Feil ved sletting av fil.",
+"Name" => "Navn",
+"Size" => "Størrelse",
+"Modified" => "Endret",
 "_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
 "_%n file_::_%n files_" => array("%n fil","%n filer"),
-"{dirs} and {files}" => "{dirs} og {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Laster opp %n fil","Laster opp %n filer"),
 "Your storage is full, files can not be updated or synced anymore!" => "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til dine personlige innstillinger for å dekryptere filene dine.",
-"Your download is being prepared. This might take some time if the files are big." => "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid.",
-"Name" => "Navn",
-"Size" => "Størrelse",
-"Modified" => "Endret",
+"{dirs} and {files}" => "{dirs} og {files}",
 "%s could not be renamed" => "Kunne ikke gi nytt navn til %s",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimum opplastingsstørrelse",
@@ -65,13 +65,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 er ubegrenset",
 "Maximum input size for ZIP files" => "Maksimal størrelse på ZIP-filer",
 "Save" => "Lagre",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Bruk denne adressen for å <a href=\"%s\" target=\"_blank\">aksessere filene dine via WebDAV</a>",
 "New" => "Ny",
 "New text file" => "Ny tekstfil",
 "Text file" => "Tekstfil",
 "New folder" => "Ny mappe",
 "Folder" => "Mappe",
 "From link" => "Fra link",
-"Deleted files" => "Slettede filer",
 "Cancel upload" => "Avbryt opplasting",
 "You don’t have permission to upload or create files here" => "Du har ikke tillatelse til å laste opp eller opprette filer her",
 "Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index e33d26e38d..b4b6be8730 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -42,14 +42,18 @@ $TRANSLATIONS = array(
 "Share" => "Delen",
 "Delete permanently" => "Verwijder definitief",
 "Rename" => "Hernoem",
+"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.",
+"Pending" => "In behandeling",
+"Error moving file." => "Fout bij verplaatsen bestand",
 "Error moving file" => "Fout bij verplaatsen bestand",
 "Error" => "Fout",
-"Pending" => "In behandeling",
 "Could not rename file" => "Kon niet hernoemen bestand",
 "Error deleting file." => "Fout bij verwijderen bestand.",
+"Name" => "Naam",
+"Size" => "Grootte",
+"Modified" => "Aangepast",
 "_%n folder_::_%n folders_" => array("","%n mappen"),
 "_%n file_::_%n files_" => array("","%n bestanden"),
-"{dirs} and {files}" => "{dirs} en {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n bestand aan het uploaden","%n bestanden aan het uploaden"),
 "\"{name}\" is an invalid file name." => "\"{name}\" is een ongeldige bestandsnaam.",
 "Your storage is full, files can not be updated or synced anymore!" => "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!",
@@ -57,10 +61,7 @@ $TRANSLATIONS = array(
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
 "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.",
-"Name" => "Naam",
-"Size" => "Grootte",
-"Modified" => "Aangepast",
+"{dirs} and {files}" => "{dirs} en {files}",
 "%s could not be renamed" => "%s kon niet worden hernoemd",
 "Upload (max. %s)" => "Upload (max. %s)",
 "File handling" => "Bestand",
@@ -71,13 +72,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 is ongelimiteerd",
 "Maximum input size for ZIP files" => "Maximale grootte voor ZIP bestanden",
 "Save" => "Bewaren",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Gebruik deze link <a href=\"%s\" target=\"_blank\">om uw bestanden via WebDAV te benaderen</a>",
 "New" => "Nieuw",
 "New text file" => "Nieuw tekstbestand",
 "Text file" => "Tekstbestand",
 "New folder" => "Nieuwe map",
 "Folder" => "Map",
 "From link" => "Vanaf link",
-"Deleted files" => "Verwijderde bestanden",
 "Cancel upload" => "Upload afbreken",
 "You don’t have permission to upload or create files here" => "U hebt geen toestemming om hier te uploaden of bestanden te maken",
 "Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 693bfccb09..2c6c0479eb 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -27,20 +27,20 @@ $TRANSLATIONS = array(
 "Share" => "Del",
 "Delete permanently" => "Slett for godt",
 "Rename" => "Endra namn",
+"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.",
+"Pending" => "Under vegs",
 "Error moving file" => "Feil ved flytting av fil",
 "Error" => "Feil",
-"Pending" => "Under vegs",
+"Name" => "Namn",
+"Size" => "Storleik",
+"Modified" => "Endra",
 "_%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("Lastar opp %n fil","Lastar opp %n filer"),
 "Your storage is full, files can not be updated or synced anymore!" => "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Lagringa di er nesten full ({usedSpacePercent} %)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar.",
-"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.",
-"Name" => "Namn",
-"Size" => "Storleik",
-"Modified" => "Endra",
+"{dirs} and {files}" => "{dirs} og {files}",
 "%s could not be renamed" => "Klarte ikkje å omdøypa på %s",
 "File handling" => "Filhandtering",
 "Maximum upload size" => "Maksimal opplastingsstorleik",
@@ -50,11 +50,12 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 er ubegrensa",
 "Maximum input size for ZIP files" => "Maksimal storleik for ZIP-filer",
 "Save" => "Lagre",
+"WebDAV" => "WebDAV",
 "New" => "Ny",
 "Text file" => "Tekst fil",
+"New folder" => "Ny mappe",
 "Folder" => "Mappe",
 "From link" => "Frå lenkje",
-"Deleted files" => "Sletta filer",
 "Cancel upload" => "Avbryt opplasting",
 "Nothing in here. Upload something!" => "Ingenting her. Last noko opp!",
 "Download" => "Last ned",
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index f3d790a533..3683ae433a 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -11,14 +11,14 @@ $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",
-"_%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",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "File handling" => "Manejament de fichièr",
 "Maximum upload size" => "Talha maximum d'amontcargament",
 "max. possible: " => "max. possible: ",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 30c3496db3..177ae51391 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -42,14 +42,18 @@ $TRANSLATIONS = array(
 "Share" => "Udostępnij",
 "Delete permanently" => "Trwale usuń",
 "Rename" => "Zmień nazwę",
+"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.",
+"Pending" => "Oczekujące",
+"Error moving file." => "Błąd podczas przenoszenia pliku.",
 "Error moving file" => "Błąd prz przenoszeniu pliku",
 "Error" => "Błąd",
-"Pending" => "Oczekujące",
 "Could not rename file" => "Nie można zmienić nazwy pliku",
 "Error deleting file." => "Błąd podczas usuwania pliku",
+"Name" => "Nazwa",
+"Size" => "Rozmiar",
+"Modified" => "Modyfikacja",
 "_%n folder_::_%n folders_" => array("%n katalog","%n katalogi","%n katalogów"),
 "_%n file_::_%n files_" => array("%n plik","%n pliki","%n plików"),
-"{dirs} and {files}" => "{dirs} i {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Wysyłanie %n pliku","Wysyłanie %n plików","Wysyłanie %n plików"),
 "\"{name}\" is an invalid file name." => "\"{name}\" jest nieprawidłową nazwą pliku.",
 "Your storage is full, files can not be updated or synced anymore!" => "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!",
@@ -57,10 +61,7 @@ $TRANSLATIONS = array(
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie.",
 "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.",
-"Name" => "Nazwa",
-"Size" => "Rozmiar",
-"Modified" => "Modyfikacja",
+"{dirs} and {files}" => "{dirs} i {files}",
 "%s could not be renamed" => "%s nie można zmienić nazwy",
 "Upload (max. %s)" => "Wysyłka (max. %s)",
 "File handling" => "Zarządzanie plikami",
@@ -71,13 +72,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 - bez limitów",
 "Maximum input size for ZIP files" => "Maksymalna wielkość pliku wejściowego ZIP ",
 "Save" => "Zapisz",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Użyj tego adresu do <a href=\"%s\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>",
 "New" => "Nowy",
 "New text file" => "Nowy plik tekstowy",
 "Text file" => "Plik tekstowy",
 "New folder" => "Nowy folder",
 "Folder" => "Folder",
 "From link" => "Z odnośnika",
-"Deleted files" => "Pliki usunięte",
 "Cancel upload" => "Anuluj wysyłanie",
 "You don’t have permission to upload or create files here" => "Nie masz uprawnień do wczytywania lub tworzenia plików w tym miejscu",
 "Nothing in here. Upload something!" => "Pusto. Wyślij coś!",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index 10d8892e18..e65504ea47 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "Falha no envio. Não foi possível obter informações do arquivo.",
 "Invalid directory." => "Diretório inválido.",
 "Files" => "Arquivos",
+"All files" => "Todos os arquivos",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes",
 "Total file size {size1} exceeds upload limit {size2}" => "Tamanho total do arquivo {size1} excede limite de envio {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}",
@@ -42,14 +43,18 @@ $TRANSLATIONS = array(
 "Share" => "Compartilhar",
 "Delete permanently" => "Excluir permanentemente",
 "Rename" => "Renomear",
+"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.",
+"Pending" => "Pendente",
+"Error moving file." => "Erro movendo o arquivo.",
 "Error moving file" => "Erro movendo o arquivo",
 "Error" => "Erro",
-"Pending" => "Pendente",
 "Could not rename file" => "Não foi possível renomear o arquivo",
 "Error deleting file." => "Erro eliminando o arquivo.",
+"Name" => "Nome",
+"Size" => "Tamanho",
+"Modified" => "Modificado",
 "_%n folder_::_%n folders_" => array("%n pasta","%n pastas"),
 "_%n file_::_%n files_" => array("%n arquivo","%n arquivos"),
-"{dirs} and {files}" => "{dirs} e {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Enviando %n arquivo","Enviando %n arquivos"),
 "\"{name}\" is an invalid file name." => "\"{name}\" é um nome de arquivo inválido.",
 "Your storage is full, files can not be updated or synced anymore!" => "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!",
@@ -57,10 +62,7 @@ $TRANSLATIONS = array(
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "App de encriptação está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente",
 "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.",
-"Name" => "Nome",
-"Size" => "Tamanho",
-"Modified" => "Modificado",
+"{dirs} and {files}" => "{dirs} e {files}",
 "%s could not be renamed" => "%s não pode ser renomeado",
 "Upload (max. %s)" => "Envio (max. %s)",
 "File handling" => "Tratamento de Arquivo",
@@ -71,13 +73,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 para ilimitado",
 "Maximum input size for ZIP files" => "Tamanho máximo para arquivo ZIP",
 "Save" => "Guardar",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso a seus Arquivos via WebDAV</a>",
 "New" => "Novo",
 "New text file" => "Novo arquivo texto",
 "Text file" => "Arquivo texto",
 "New folder" => "Nova pasta",
 "Folder" => "Pasta",
 "From link" => "Do link",
-"Deleted files" => "Arquivos apagados",
 "Cancel upload" => "Cancelar upload",
 "You don’t have permission to upload or create files here" => "Você não tem permissão para carregar ou criar arquivos aqui",
 "Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index c24d2cf8f3..189cdebf79 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -3,7 +3,9 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Não pôde mover o ficheiro %s - Já existe um ficheiro com esse nome",
 "Could not move %s" => "Não foi possível move o ficheiro %s",
 "File name cannot be empty." => "O nome do ficheiro não pode estar vazio.",
+"\"%s\" is an invalid file name." => "\"%s\" é um nome de ficheiro inválido.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
+"The target folder has been moved or deleted." => "A pasta de destino foi movida ou eliminada.",
 "The name %s is already used in the folder %s. Please choose a different name." => "O nome %s já está em uso na pasta %s. Por favor escolha um nome diferente.",
 "Not a valid source" => "Não é uma fonte válida",
 "Server is not allowed to open URLs, please check the server configuration" => "O servidor não consegue abrir URLs, por favor verifique a configuração do servidor",
@@ -27,6 +29,8 @@ $TRANSLATIONS = array(
 "Invalid directory." => "Directório Inválido",
 "Files" => "Ficheiros",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes",
+"Total file size {size1} exceeds upload limit {size2}" => "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponível",
 "Upload cancelled." => "Envio cancelado.",
 "Could not get result from server." => "Não foi possível obter o resultado do servidor.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora.",
@@ -38,25 +42,28 @@ $TRANSLATIONS = array(
 "Share" => "Partilhar",
 "Delete permanently" => "Eliminar permanentemente",
 "Rename" => "Renomear",
+"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.",
+"Pending" => "Pendente",
+"Error moving file." => "Erro a mover o ficheiro.",
 "Error moving file" => "Erro ao mover o ficheiro",
 "Error" => "Erro",
-"Pending" => "Pendente",
 "Could not rename file" => "Não pôde renomear o ficheiro",
 "Error deleting file." => "Erro ao apagar o ficheiro.",
+"Name" => "Nome",
+"Size" => "Tamanho",
+"Modified" => "Modificado",
 "_%n folder_::_%n folders_" => array("%n pasta","%n pastas"),
 "_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
-"{dirs} and {files}" => "{dirs} e {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("A carregar %n ficheiro","A carregar %n ficheiros"),
+"\"{name}\" is an invalid file name." => "\"{name}\" é um nome de ficheiro inválido.",
 "Your storage is full, files can not be updated or synced anymore!" => "O seu armazenamento está cheio, os ficheiros não podem ser sincronizados.",
 "Your storage is almost full ({usedSpacePercent}%)" => "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "A encriptação foi desactivada mas os seus ficheiros continuam encriptados.  Por favor consulte as suas definições pessoais para desencriptar os ficheiros.",
-"Your download is being prepared. This might take some time if the files are big." => "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes.",
-"Name" => "Nome",
-"Size" => "Tamanho",
-"Modified" => "Modificado",
+"{dirs} and {files}" => "{dirs} e {files}",
 "%s could not be renamed" => "%s não pode ser renomeada",
+"Upload (max. %s)" => "Enviar (max. %s)",
 "File handling" => "Manuseamento de ficheiros",
 "Maximum upload size" => "Tamanho máximo de envio",
 "max. possible: " => "max. possivel: ",
@@ -65,13 +72,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 é ilimitado",
 "Maximum input size for ZIP files" => "Tamanho máximo para ficheiros ZIP",
 "Save" => "Guardar",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>",
 "New" => "Novo",
 "New text file" => "Novo ficheiro de texto",
 "Text file" => "Ficheiro de texto",
 "New folder" => "Nova Pasta",
 "Folder" => "Pasta",
 "From link" => "Da ligação",
-"Deleted files" => "Ficheiros eliminados",
 "Cancel upload" => "Cancelar envio",
 "You don’t have permission to upload or create files here" => "Você não tem permissão para enviar ou criar ficheiros aqui",
 "Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index d3927f5daf..befb4bad3a 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -6,7 +6,9 @@ $TRANSLATIONS = array(
 "\"%s\" is an invalid file name." => "\"%s\" este un nume de fișier nevalid",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume nevalide, '\\', '/', '<', '>', ':', '\"', '|', '?' și '*' nu sunt permise.",
 "The target folder has been moved or deleted." => "Dosarul țintă a fost mutat sau șters.",
+"The name %s is already used in the folder %s. Please choose a different name." => "Numele %s este deja este folosit în dosarul %s. Te rog alege alt nume.",
 "Not a valid source" => "Sursă nevalidă",
+"Server is not allowed to open URLs, please check the server configuration" => "Serverului nu ii este permis sa deschida URL-ul , verificati setarile serverului",
 "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.",
@@ -40,23 +42,26 @@ $TRANSLATIONS = array(
 "Share" => "Partajează",
 "Delete permanently" => "Șterge permanent",
 "Rename" => "Redenumește",
+"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.",
+"Pending" => "În așteptare",
+"Error moving file." => "Eroare la mutarea fișierului.",
 "Error moving file" => "Eroare la mutarea fișierului",
 "Error" => "Eroare",
-"Pending" => "În așteptare",
 "Could not rename file" => "Nu s-a putut redenumi fisierul",
 "Error deleting file." => "Eroare la ștergerea fisierului.",
+"Name" => "Nume",
+"Size" => "Mărime",
+"Modified" => "Modificat",
 "_%n folder_::_%n folders_" => array("%n director","%n directoare","%n directoare"),
 "_%n file_::_%n files_" => array("%n fișier","%n fișiere","%n fișiere"),
-"{dirs} and {files}" => "{dirs} și {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Se încarcă %n fișier.","Se încarcă %n fișiere.","Se încarcă %n fișiere."),
 "\"{name}\" is an invalid file name." => "\"{name}\" este un nume de fișier nevalid.",
 "Your storage is full, files can not be updated or synced anymore!" => "Spațiul de stocare este plin, fișierele nu mai pot fi actualizate sau sincronizate!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Spațiul de stocare este aproape plin ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Aplicatia de criptare este activata dar tastatura nu este initializata , va rugam deconectati-va si reconectati-va",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Cheie privată nevalidă pentru aplicația Încriptare. Te rog, actualizează-ți parola cheii private folosind setările personale pentru a reaccesa fișierele tale încriptate.",
 "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.",
-"Name" => "Nume",
-"Size" => "Mărime",
-"Modified" => "Modificat",
+"{dirs} and {files}" => "{dirs} și {files}",
 "%s could not be renamed" => "%s nu a putut fi redenumit",
 "Upload (max. %s)" => "Încarcă (max. %s)",
 "File handling" => "Manipulare fișiere",
@@ -67,13 +72,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 este nelimitat",
 "Maximum input size for ZIP files" => "Dimensiunea maximă de intrare pentru fișierele ZIP",
 "Save" => "Salvează",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Folosește această adresă <a href=\"%s\" target=\"_blank\">pentru acces la fișierele tale folosind WebDAV</a>",
 "New" => "Nou",
 "New text file" => "Un nou fișier text",
 "Text file" => "Fișier text",
 "New folder" => "Un nou dosar",
 "Folder" => "Dosar",
 "From link" => "De la adresa",
-"Deleted files" => "Fișiere șterse",
 "Cancel upload" => "Anulează încărcarea",
 "You don’t have permission to upload or create files here" => "Nu aveti permisiunea de a incarca sau crea fisiere aici",
 "Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index d10a7e2eca..9ebd626eac 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -42,14 +42,17 @@ $TRANSLATIONS = array(
 "Share" => "Открыть доступ",
 "Delete permanently" => "Удалить окончательно",
 "Rename" => "Переименовать",
+"Your download is being prepared. This might take some time if the files are big." => "Идёт подготовка к скачиванию. Это может занять некоторое время, если файлы большого размера.",
+"Pending" => "Ожидание",
 "Error moving file" => "Ошибка при перемещении файла",
 "Error" => "Ошибка",
-"Pending" => "Ожидание",
 "Could not rename file" => "Не удалось переименовать файл",
 "Error deleting file." => "Ошибка при удалении файла.",
+"Name" => "Имя",
+"Size" => "Размер",
+"Modified" => "Дата изменения",
 "_%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!" => "Ваше хранилище заполнено, произведите очистку перед загрузкой новых файлов.",
@@ -57,10 +60,7 @@ $TRANSLATIONS = array(
 "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." => "Идёт подготовка к скачиванию. Это может занять некоторое время, если файлы большого размера.",
-"Name" => "Имя",
-"Size" => "Размер",
-"Modified" => "Дата изменения",
+"{dirs} and {files}" => "{dirs} и {files}",
 "%s could not be renamed" => "%s не может быть переименован",
 "Upload (max. %s)" => "Загружено (max. %s)",
 "File handling" => "Управление файлами",
@@ -71,13 +71,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 - без ограничений",
 "Maximum input size for ZIP files" => "Максимальный исходный размер для ZIP файлов",
 "Save" => "Сохранить",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Используйте этот адресс для <a href=\"%s\" target=\"_blank\">доступа к вашим файлам через WebDAV</a>",
 "New" => "Новый",
 "New text file" => "Новый текстовый файл",
 "Text file" => "Текстовый файл",
 "New folder" => "Новый каталог",
 "Folder" => "Каталог",
 "From link" => "Объект по ссылке",
-"Deleted files" => "Удалённые файлы",
 "Cancel upload" => "Отменить загрузку",
 "You don’t have permission to upload or create files here" => "У вас нет прав для загрузки или создания файлов здесь.",
 "Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index ff6672f711..e8d2a8a53c 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -13,12 +13,12 @@ $TRANSLATIONS = array(
 "Share" => "බෙදා හදා ගන්න",
 "Rename" => "නැවත නම් කරන්න",
 "Error" => "දෝෂයක්",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "නම",
 "Size" => "ප්‍රමාණය",
 "Modified" => "වෙනස් කළ",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "File handling" => "ගොනු පරිහරණය",
 "Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය",
 "max. possible: " => "හැකි උපරිමය:",
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 3d92dc1b5a..2372a34aa3 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -42,14 +42,17 @@ $TRANSLATIONS = array(
 "Share" => "Zdieľať",
 "Delete permanently" => "Zmazať  trvalo",
 "Rename" => "Premenovať",
+"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ť.",
+"Pending" => "Prebieha",
 "Error moving file" => "Chyba pri presúvaní súboru",
 "Error" => "Chyba",
-"Pending" => "Prebieha",
 "Could not rename file" => "Nemožno premenovať súbor",
 "Error deleting file." => "Chyba pri mazaní súboru.",
+"Name" => "Názov",
+"Size" => "Veľkosť",
+"Modified" => "Upravené",
 "_%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ť!",
@@ -57,10 +60,7 @@ $TRANSLATIONS = array(
 "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ť.",
-"Name" => "Názov",
-"Size" => "Veľkosť",
-"Modified" => "Upravené",
+"{dirs} and {files}" => "{dirs} a {files}",
 "%s could not be renamed" => "%s nemohol byť premenovaný",
 "Upload (max. %s)" => "Nahrať (max. %s)",
 "File handling" => "Nastavenie správania sa k súborom",
@@ -71,13 +71,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 znamená neobmedzené",
 "Maximum input size for ZIP files" => "Najväčšia veľkosť ZIP súborov",
 "Save" => "Uložiť",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prístup k vašim súborom cez WebDAV</a>",
 "New" => "Nový",
 "New text file" => "Nový textový súbor",
 "Text file" => "Textový súbor",
 "New folder" => "Nový priečinok",
 "Folder" => "Priečinok",
 "From link" => "Z odkazu",
-"Deleted files" => "Zmazané súbory",
 "Cancel upload" => "Zrušiť odosielanie",
 "You don’t have permission to upload or create files here" => "Nemáte oprávnenie sem nahrávať alebo vytvoriť súbory",
 "Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index ac304d992c..48f455cc87 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -42,14 +42,18 @@ $TRANSLATIONS = array(
 "Share" => "Souporaba",
 "Delete permanently" => "Izbriši dokončno",
 "Rename" => "Preimenuj",
+"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.",
+"Pending" => "V čakanju ...",
+"Error moving file." => "Napaka premikanja datoteke.",
 "Error moving file" => "Napaka premikanja datoteke",
 "Error" => "Napaka",
-"Pending" => "V čakanju ...",
 "Could not rename file" => "Ni mogoče preimenovati datoteke",
 "Error deleting file." => "Napaka brisanja datoteke.",
+"Name" => "Ime",
+"Size" => "Velikost",
+"Modified" => "Spremenjeno",
 "_%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"),
-"{dirs} and {files}" => "{dirs} in {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Posodabljanje %n datoteke","Posodabljanje %n datotek","Posodabljanje %n datotek","Posodabljanje %n datotek"),
 "\"{name}\" is an invalid file name." => "\"{name}\" je neveljavno ime datoteke.",
 "Your storage is full, files can not be updated or synced anymore!" => "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!",
@@ -57,10 +61,7 @@ $TRANSLATIONS = array(
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.",
 "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.",
-"Name" => "Ime",
-"Size" => "Velikost",
-"Modified" => "Spremenjeno",
+"{dirs} and {files}" => "{dirs} in {files}",
 "%s could not be renamed" => "%s ni mogoče preimenovati",
 "Upload (max. %s)" => "Pošiljanje (omejitev %s)",
 "File handling" => "Upravljanje z datotekami",
@@ -71,13 +72,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 predstavlja neomejeno vrednost",
 "Maximum input size for ZIP files" => "Največja vhodna velikost za datoteke ZIP",
 "Save" => "Shrani",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek rpeko sistema WebDAV</a>.",
 "New" => "Novo",
 "New text file" => "Nova besedilna datoteka",
 "Text file" => "Besedilna datoteka",
 "New folder" => "Nova mapa",
 "Folder" => "Mapa",
 "From link" => "Iz povezave",
-"Deleted files" => "Izbrisane datoteke",
 "Cancel upload" => "Prekliči pošiljanje",
 "You don’t have permission to upload or create files here" => "Ni ustreznih dovoljenj za pošiljanje ali ustvarjanje datotek na tem mestu.",
 "Nothing in here. Upload something!" => "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!",
diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php
index a7f1cb3413..5a125683b0 100644
--- a/apps/files/l10n/sq.php
+++ b/apps/files/l10n/sq.php
@@ -25,20 +25,20 @@ $TRANSLATIONS = array(
 "Share" => "Ndaj",
 "Delete permanently" => "Fshi përfundimisht",
 "Rename" => "Riemëro",
+"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.",
+"Pending" => "Në vijim",
 "Error moving file" => "Gabim lëvizjen dokumentave",
 "Error" => "Gabim",
-"Pending" => "Në vijim",
+"Name" => "Emri",
+"Size" => "Madhësia",
+"Modified" => "Ndryshuar",
 "_%n folder_::_%n folders_" => array("%n dosje","%n dosje"),
 "_%n file_::_%n files_" => array("%n skedar","%n skedarë"),
-"{dirs} and {files}" => "{dirs} dhe {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Po ngarkoj %n skedar","Po ngarkoj %n skedarë"),
 "Your storage is full, files can not be updated or synced anymore!" => "Hapsira juaj e arkivimit është plot, skedarët nuk mund të përditësohen ose sinkronizohen!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Hapsira juaj e arkivimit është pothuajse në fund  ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj.",
-"Your download is being prepared. This might take some time if the files are big." => "Shkarkimi juaj është duke u përgatitur. Kjo mund të kërkojë kohë nëse skedarët janë të mëdhenj.",
-"Name" => "Emri",
-"Size" => "Madhësia",
-"Modified" => "Ndryshuar",
+"{dirs} and {files}" => "{dirs} dhe {files}",
 "%s could not be renamed" => "Nuk është i mundur riemërtimi i %s",
 "File handling" => "Trajtimi i Skedarëve",
 "Maximum upload size" => "Madhësia maksimale e nagarkimit",
@@ -48,12 +48,12 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "o është pa limit",
 "Maximum input size for ZIP files" => "Maksimumi hyrës i skedarëve ZIP",
 "Save" => "Ruaj",
+"WebDAV" => "WebDAV",
 "New" => "E re",
 "Text file" => "Skedar tekst",
 "New folder" => "Dosje e're",
 "Folder" => "Dosje",
 "From link" => "Nga lidhja",
-"Deleted files" => "Skedarë të fshirë ",
 "Cancel upload" => "Anullo ngarkimin",
 "Nothing in here. Upload something!" => "Këtu nuk ka asgje. Ngarko dicka",
 "Download" => "Shkarko",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index 866d8dbdd0..1f0aaab8cf 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -21,17 +21,17 @@ $TRANSLATIONS = array(
 "Share" => "Дели",
 "Delete permanently" => "Обриши за стално",
 "Rename" => "Преименуј",
-"Error" => "Грешка",
+"Your download is being prepared. This might take some time if the files are big." => "Припремам преузимање. Ово може да потраје ако су датотеке велике.",
 "Pending" => "На чекању",
+"Error" => "Грешка",
+"Name" => "Име",
+"Size" => "Величина",
+"Modified" => "Измењено",
 "_%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." => "Припремам преузимање. Ово може да потраје ако су датотеке велике.",
-"Name" => "Име",
-"Size" => "Величина",
-"Modified" => "Измењено",
 "File handling" => "Управљање датотекама",
 "Maximum upload size" => "Највећа величина датотеке",
 "max. possible: " => "највећа величина:",
@@ -40,11 +40,11 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 је неограничено",
 "Maximum input size for ZIP files" => "Највећа величина ZIP датотека",
 "Save" => "Сачувај",
+"WebDAV" => "WebDAV",
 "New" => "Нова",
 "Text file" => "текстуална датотека",
 "Folder" => "фасцикла",
 "From link" => "Са везе",
-"Deleted files" => "Обрисане датотеке",
 "Cancel upload" => "Прекини отпремање",
 "Nothing in here. Upload something!" => "Овде нема ничег. Отпремите нешто!",
 "Download" => "Преузми",
diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php
index 38039a19fc..8ec42c56c7 100644
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@@ -9,12 +9,12 @@ $TRANSLATIONS = array(
 "Share" => "Podeli",
 "Rename" => "Preimenij",
 "Error" => "Greška",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "Name" => "Ime",
 "Size" => "Veličina",
 "Modified" => "Zadnja izmena",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "Maximum upload size" => "Maksimalna veličina pošiljke",
 "Save" => "Snimi",
 "Nothing in here. Upload something!" => "Ovde nema ničeg. Pošaljite nešto!",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index f3d0170a30..657eef4756 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "Uppladdning misslyckades. Gick inte att hämta filinformation.",
 "Invalid directory." => "Felaktig mapp.",
 "Files" => "Filer",
+"All files" => "Alla 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.",
@@ -42,14 +43,18 @@ $TRANSLATIONS = array(
 "Share" => "Dela",
 "Delete permanently" => "Radera permanent",
 "Rename" => "Byt namn",
+"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.",
+"Pending" => "Väntar",
+"Error moving file." => "Fel vid flytt av fil.",
 "Error moving file" => "Fel uppstod vid flyttning av fil",
 "Error" => "Fel",
-"Pending" => "Väntar",
 "Could not rename file" => "Kan ej byta filnamn",
 "Error deleting file." => "Kunde inte ta bort filen.",
+"Name" => "Namn",
+"Size" => "Storlek",
+"Modified" => "Ändrad",
 "_%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!",
@@ -57,10 +62,7 @@ $TRANSLATIONS = array(
 "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.",
-"Name" => "Namn",
-"Size" => "Storlek",
-"Modified" => "Ändrad",
+"{dirs} and {files}" => "{dirs} och {files}",
 "%s could not be renamed" => "%s kunde inte namnändras",
 "Upload (max. %s)" => "Ladda upp (max. %s)",
 "File handling" => "Filhantering",
@@ -71,13 +73,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 är oändligt",
 "Maximum input size for ZIP files" => "Största tillåtna storlek för ZIP-filer",
 "Save" => "Spara",
+"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>",
 "New" => "Ny",
 "New text file" => "Ny textfil",
 "Text file" => "Textfil",
 "New folder" => "Ny mapp",
 "Folder" => "Mapp",
 "From link" => "Från länk",
-"Deleted files" => "Raderade filer",
 "Cancel upload" => "Avbryt uppladdning",
 "You don’t have permission to upload or create files here" => "Du har ej tillåtelse att ladda upp eller skapa filer här",
 "Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
diff --git a/apps/files/l10n/ta_IN.php b/apps/files/l10n/ta_IN.php
new file mode 100644
index 0000000000..0157af093e
--- /dev/null
+++ b/apps/files/l10n/ta_IN.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/ta_LK.php b/apps/files/l10n/ta_LK.php
index 0ab17785b9..bba3ce9942 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -14,14 +14,14 @@ $TRANSLATIONS = array(
 "{new_name} already exists" => "{new_name} ஏற்கனவே உள்ளது",
 "Share" => "பகிர்வு",
 "Rename" => "பெயர்மாற்றம்",
-"Error" => "வழு",
 "Pending" => "நிலுவையிலுள்ள",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Error" => "வழு",
 "Name" => "பெயர்",
 "Size" => "அளவு",
 "Modified" => "மாற்றப்பட்டது",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "File handling" => "கோப்பு கையாளுதல்",
 "Maximum upload size" => "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ",
 "max. possible: " => "ஆகக் கூடியது:",
diff --git a/apps/files/l10n/te.php b/apps/files/l10n/te.php
index b2cf4c01d8..0cf230fd55 100644
--- a/apps/files/l10n/te.php
+++ b/apps/files/l10n/te.php
@@ -2,11 +2,11 @@
 $TRANSLATIONS = array(
 "Delete permanently" => "శాశ్వతంగా తొలగించు",
 "Error" => "పొరపాటు",
+"Name" => "పేరు",
+"Size" => "పరిమాణం",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Name" => "పేరు",
-"Size" => "పరిమాణం",
 "Save" => "భద్రపరచు",
 "New folder" => "కొత్త సంచయం",
 "Folder" => "సంచయం",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index f0fd29da7e..67ebb99f66 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -20,17 +20,17 @@ $TRANSLATIONS = array(
 "{new_name} already exists" => "{new_name} มีอยู่แล้วในระบบ",
 "Share" => "แชร์",
 "Rename" => "เปลี่ยนชื่อ",
-"Error" => "ข้อผิดพลาด",
+"Your download is being prepared. This might take some time if the files are big." => "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่",
 "Pending" => "อยู่ระหว่างดำเนินการ",
+"Error" => "ข้อผิดพลาด",
+"Name" => "ชื่อ",
+"Size" => "ขนาด",
+"Modified" => "แก้ไขแล้ว",
 "_%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." => "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่",
-"Name" => "ชื่อ",
-"Size" => "ขนาด",
-"Modified" => "แก้ไขแล้ว",
 "File handling" => "การจัดกาไฟล์",
 "Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
 "max. possible: " => "จำนวนสูงสุดที่สามารถทำได้: ",
@@ -39,6 +39,7 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 หมายถึงไม่จำกัด",
 "Maximum input size for ZIP files" => "ขนาดไฟล์ ZIP สูงสุด",
 "Save" => "บันทึก",
+"WebDAV" => "WebDAV",
 "New" => "อัพโหลดไฟล์ใหม่",
 "Text file" => "ไฟล์ข้อความ",
 "New folder" => "โฟลเดอร์ใหม่",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 77c310fc9e..45e8062ad6 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "Yükleme başarısız. Dosya bilgisi alınamadı.",
 "Invalid directory." => "Geçersiz dizin.",
 "Files" => "Dosyalar",
+"All files" => "Tüm 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}, {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",
@@ -41,15 +42,19 @@ $TRANSLATIONS = array(
 "Error fetching URL" => "Adres getirilirken hata",
 "Share" => "Paylaş",
 "Delete permanently" => "Kalıcı olarak sil",
-"Rename" => "İsim değiştir.",
+"Rename" => "Yeniden adlandır",
+"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.",
+"Pending" => "Bekliyor",
+"Error moving file." => "Dosya taşıma hatası.",
 "Error moving file" => "Dosya taşıma hatası",
 "Error" => "Hata",
-"Pending" => "Bekliyor",
 "Could not rename file" => "Dosya adlandırılamadı",
 "Error deleting file." => "Dosya silinirken hata.",
+"Name" => "İsim",
+"Size" => "Boyut",
+"Modified" => "Değiştirilme",
 "_%n folder_::_%n folders_" => array("%n dizin","%n dizin"),
 "_%n file_::_%n files_" => array("%n dosya","%n dosya"),
-"{dirs} and {files}" => "{dirs} ve {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n dosya yükleniyor","%n dosya yükleniyor"),
 "\"{name}\" is an invalid file name." => "\"{name}\" geçersiz bir dosya adı.",
 "Your storage is full, files can not be updated or synced anymore!" => "Depolama alanınız dolu, artık dosyalar güncellenmeyecek veya eşitlenmeyecek.",
@@ -57,10 +62,7 @@ $TRANSLATIONS = array(
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
 "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.",
-"Name" => "İsim",
-"Size" => "Boyut",
-"Modified" => "Değiştirilme",
+"{dirs} and {files}" => "{dirs} ve {files}",
 "%s could not be renamed" => "%s yeniden adlandırılamadı",
 "Upload (max. %s)" => "Yükle (azami: %s)",
 "File handling" => "Dosya işlemleri",
@@ -71,13 +73,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 limitsiz demektir",
 "Maximum input size for ZIP files" => "ZIP dosyaları için en fazla girdi boyutu",
 "Save" => "Kaydet",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">Dosyalarınıza WebDAV aracılığıyla erişmek için</a> bu adresi kullanın",
 "New" => "Yeni",
 "New text file" => "Yeni metin dosyası",
 "Text file" => "Metin dosyası",
 "New folder" => "Yeni klasör",
 "Folder" => "Klasör",
 "From link" => "Bağlantıdan",
-"Deleted files" => "Silinmiş dosyalar",
 "Cancel upload" => "Yüklemeyi iptal et",
 "You don’t have permission to upload or create files here" => "Buraya dosya yükleme veya oluşturma izniniz yok",
 "Nothing in here. Upload something!" => "Burada hiçbir şey yok. Bir şeyler yükleyin!",
diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php
index 58ccba94c1..b104f60794 100644
--- a/apps/files/l10n/ug.php
+++ b/apps/files/l10n/ug.php
@@ -13,20 +13,20 @@ $TRANSLATIONS = array(
 "Share" => "ھەمبەھىر",
 "Delete permanently" => "مەڭگۈلۈك ئۆچۈر",
 "Rename" => "ئات ئۆزگەرت",
-"Error" => "خاتالىق",
 "Pending" => "كۈتۈۋاتىدۇ",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
-"_Uploading %n file_::_Uploading %n files_" => array(""),
+"Error" => "خاتالىق",
 "Name" => "ئاتى",
 "Size" => "چوڭلۇقى",
 "Modified" => "ئۆزگەرتكەن",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "Save" => "ساقلا",
+"WebDAV" => "WebDAV",
 "New" => "يېڭى",
 "Text file" => "تېكىست ھۆججەت",
 "New folder" => "يېڭى قىسقۇچ",
 "Folder" => "قىسقۇچ",
-"Deleted files" => "ئۆچۈرۈلگەن ھۆججەتلەر",
 "Cancel upload" => "يۈكلەشتىن ۋاز كەچ",
 "Nothing in here. Upload something!" => "بۇ جايدا ھېچنېمە يوق. Upload something!",
 "Download" => "چۈشۈر",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 5643dedb9d..efdbcc2c4b 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -26,19 +26,19 @@ $TRANSLATIONS = array(
 "Share" => "Поділитися",
 "Delete permanently" => "Видалити назавжди",
 "Rename" => "Перейменувати",
+"Your download is being prepared. This might take some time if the files are big." => "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі.",
+"Pending" => "Очікування",
 "Error moving file" => "Помилка переміщення файлу",
 "Error" => "Помилка",
-"Pending" => "Очікування",
 "Could not rename file" => "Неможливо перейменувати файл",
+"Name" => "Ім'я",
+"Size" => "Розмір",
+"Modified" => "Змінено",
 "_%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." => "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі.",
-"Name" => "Ім'я",
-"Size" => "Розмір",
-"Modified" => "Змінено",
 "%s could not be renamed" => "%s не може бути перейменований",
 "File handling" => "Робота з файлами",
 "Maximum upload size" => "Максимальний розмір відвантажень",
@@ -48,12 +48,12 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 є безліміт",
 "Maximum input size for ZIP files" => "Максимальний розмір завантажуємого ZIP файлу",
 "Save" => "Зберегти",
+"WebDAV" => "WebDAV",
 "New" => "Створити",
 "Text file" => "Текстовий файл",
 "New folder" => "Нова тека",
 "Folder" => "Тека",
 "From link" => "З посилання",
-"Deleted files" => "Видалено файлів",
 "Cancel upload" => "Перервати завантаження",
 "Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
 "Download" => "Завантажити",
diff --git a/apps/files/l10n/ur_PK.php b/apps/files/l10n/ur_PK.php
index b9548acde9..203f93b5e8 100644
--- a/apps/files/l10n/ur_PK.php
+++ b/apps/files/l10n/ur_PK.php
@@ -1,8 +1,12 @@
 <?php
 $TRANSLATIONS = array(
+"Share" => "تقسیم",
 "Error" => "ایرر",
+"Name" => "اسم",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Save" => "حفظ",
+"Delete" => "حذف کریں"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index 058add4bb7..c8b8a69604 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -37,23 +37,23 @@ $TRANSLATIONS = array(
 "Share" => "Chia sẻ",
 "Delete permanently" => "Xóa vĩnh vễn",
 "Rename" => "Sửa tên",
+"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.",
+"Pending" => "Đang chờ",
 "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",
 "Error deleting file." => "Lỗi xóa file,",
+"Name" => "Tên",
+"Size" => "Kích cỡ",
+"Modified" => "Thay đổi",
 "_%n folder_::_%n folders_" => array("%n thư mục"),
 "_%n file_::_%n files_" => array("%n tập tin"),
-"{dirs} and {files}" => "{dirs} và {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Đang tải lên %n tập tin"),
 "Your storage is full, files can not be updated or synced anymore!" => "Your storage is full, files can not be updated or synced anymore!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Your storage is almost full ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Mã hóa đã bị vô hiệu nhưng những tập tin của bạn vẫn được mã hóa. Vui lòng vào phần thiết lập cá nhân để giải mã chúng.",
-"Your download is being prepared. This might take some time if the files are big." => "Your download is being prepared. This might take some time if the files are big.",
-"Name" => "Tên",
-"Size" => "Kích cỡ",
-"Modified" => "Thay đổi",
+"{dirs} and {files}" => "{dirs} và {files}",
 "%s could not be renamed" => "%s không thể đổi tên",
 "File handling" => "Xử lý tập tin",
 "Maximum upload size" => "Kích thước tối đa ",
@@ -63,13 +63,13 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 là không giới hạn",
 "Maximum input size for ZIP files" => "Kích thước tối đa cho các tập tin ZIP",
 "Save" => "Lưu",
+"WebDAV" => "WebDAV",
 "New" => "Tạo mới",
 "New text file" => "File text mới",
 "Text file" => "Tập tin văn bản",
 "New folder" => "Tạo thư mục",
 "Folder" => "Thư mục",
 "From link" => "Từ liên kết",
-"Deleted files" => "File đã bị xóa",
 "Cancel upload" => "Hủy upload",
 "You don’t have permission to upload or create files here" => "Bạn không có quyền upload hoặc tạo files ở đây",
 "Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 82cc68a499..39c7f86ece 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.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} ，由于它是一个目录或者为0字节",
+"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." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
@@ -38,25 +42,28 @@ $TRANSLATIONS = array(
 "Share" => "分享",
 "Delete permanently" => "永久删除",
 "Rename" => "重命名",
+"Your download is being prepared. This might take some time if the files are big." => "下载正在准备中。如果文件较大可能会花费一些时间。",
+"Pending" => "等待",
+"Error moving file." => "移动文件出错。",
 "Error moving file" => "移动文件错误",
 "Error" => "错误",
-"Pending" => "等待",
 "Could not rename file" => "不能重命名文件",
 "Error deleting file." => "删除文件出错。",
+"Name" => "名称",
+"Size" => "大小",
+"Modified" => "修改日期",
 "_%n folder_::_%n folders_" => array("%n 文件夹"),
 "_%n file_::_%n files_" => array("%n个文件"),
-"{dirs} and {files}" => "{dirs} 和 {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("上传 %n 个文件"),
+"\"{name}\" is an invalid file name." => "“{name}”是一个无效的文件名。",
 "Your storage is full, files can not be updated or synced anymore!" => "您的存储空间已满，文件将无法更新或同步！",
 "Your storage is almost full ({usedSpacePercent}%)" => "您的存储空间即将用完 ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "加密是被禁用的，但是您的文件还是被加密了。请到您的个人配置里设置文件加密选项。",
-"Your download is being prepared. This might take some time if the files are big." => "下载正在准备中。如果文件较大可能会花费一些时间。",
-"Name" => "名称",
-"Size" => "大小",
-"Modified" => "修改日期",
+"{dirs} and {files}" => "{dirs} 和 {files}",
 "%s could not be renamed" => "%s 不能被重命名",
+"Upload (max. %s)" => "上传 (最大 %s)",
 "File handling" => "文件处理",
 "Maximum upload size" => "最大上传大小",
 "max. possible: " => "最大允许: ",
@@ -65,13 +72,14 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 为无限制",
 "Maximum input size for ZIP files" => "ZIP 文件的最大输入大小",
 "Save" => "保存",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "使用这个地址 <a href=\"%s\" target=\"_blank\">通过 WebDAV 访问您的文件</a>",
 "New" => "新建",
 "New text file" => "创建文本文件",
 "Text file" => "文本文件",
 "New folder" => "添加文件夹",
 "Folder" => "文件夹",
 "From link" => "来自链接",
-"Deleted files" => "已删除文件",
 "Cancel upload" => "取消上传",
 "You don’t have permission to upload or create files here" => "您没有权限来上传湖州哦和创建文件",
 "Nothing in here. Upload something!" => "这里还什么都没有。上传些东西吧！",
diff --git a/apps/files/l10n/zh_HK.php b/apps/files/l10n/zh_HK.php
index 13aa6ac3e3..62a37f4040 100644
--- a/apps/files/l10n/zh_HK.php
+++ b/apps/files/l10n/zh_HK.php
@@ -3,11 +3,11 @@ $TRANSLATIONS = array(
 "Files" => "文件",
 "Share" => "分享",
 "Error" => "錯誤",
+"Name" => "名稱",
+"Size" => "大小",
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
-"Name" => "名稱",
-"Size" => "大小",
 "Save" => "儲存",
 "New folder" => "新文件夾",
 "Download" => "下載",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 92bc13189d..9e56c853ad 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -36,23 +36,23 @@ $TRANSLATIONS = array(
 "Share" => "分享",
 "Delete permanently" => "永久刪除",
 "Rename" => "重新命名",
+"Your download is being prepared. This might take some time if the files are big." => "正在準備您的下載，若您的檔案較大，將會需要更多時間。",
+"Pending" => "等候中",
 "Error moving file" => "移動檔案失敗",
 "Error" => "錯誤",
-"Pending" => "等候中",
 "Could not rename file" => "無法重新命名",
+"Name" => "名稱",
+"Size" => "大小",
+"Modified" => "修改時間",
 "_%n folder_::_%n folders_" => array("%n 個資料夾"),
 "_%n file_::_%n files_" => array("%n 個檔案"),
-"{dirs} and {files}" => "{dirs} 和 {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n 個檔案正在上傳"),
 "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." => "正在準備您的下載，若您的檔案較大，將會需要更多時間。",
-"Name" => "名稱",
-"Size" => "大小",
-"Modified" => "修改時間",
+"{dirs} and {files}" => "{dirs} 和 {files}",
 "%s could not be renamed" => "無法重新命名 %s",
 "File handling" => "檔案處理",
 "Maximum upload size" => "上傳限制",
@@ -62,12 +62,13 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0代表沒有限制",
 "Maximum input size for ZIP files" => "ZIP 壓縮前的原始大小限制",
 "Save" => "儲存",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "使用這個地址<a href=\"%s\" target=\"_blank\">來透過 WebDAV 存取檔案</a>",
 "New" => "新增",
 "Text file" => "文字檔",
 "New folder" => "新資料夾",
 "Folder" => "資料夾",
 "From link" => "從連結",
-"Deleted files" => "回收桶",
 "Cancel upload" => "取消上傳",
 "You don’t have permission to upload or create files here" => "您沒有權限在這裡上傳或建立檔案",
 "Nothing in here. Upload something!" => "這裡還沒有東西，上傳一些吧！",
diff --git a/apps/files/lib/app.php b/apps/files/lib/app.php
index ed4aa32c66..e32225d068 100644
--- a/apps/files/lib/app.php
+++ b/apps/files/lib/app.php
@@ -30,6 +30,11 @@ class App {
 	 */
 	private $l10n;
 
+	/**
+	 * @var \OCP\INavigationManager
+	 */
+	private static $navigationManager;
+
 	/**
 	 * @var \OC\Files\View
 	 */
@@ -40,6 +45,18 @@ class App {
 		$this->l10n = $l10n;
 	}
 
+	/**
+	 * Returns the app's navigation manager
+	 *
+	 * @return \OCP\INavigationManager
+	 */
+	public static function getNavigationManager() {
+		if (self::$navigationManager === null) {
+			self::$navigationManager = new \OC\NavigationManager();
+		}
+		return self::$navigationManager;
+	}
+
 	/**
 	 * rename a file
 	 *
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index 0ae87d12fb..7d8906e225 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -1,7 +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 OCA\Files;
 
+/**
+ * Helper class for manipulating file information
+ */
 class Helper
 {
 	public static function buildFileStorageStatistics($dir) {
@@ -9,12 +18,12 @@ class Helper
 		$storageInfo = \OC_Helper::getStorageInfo($dir);
 
 		$l = new \OC_L10N('files');
-		$maxUploadFilesize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
-		$maxHumanFilesize = \OCP\Util::humanFileSize($maxUploadFilesize);
-		$maxHumanFilesize = $l->t('Upload (max. %s)', array($maxHumanFilesize));
+		$maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
+		$maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize);
+		$maxHumanFileSize = $l->t('Upload (max. %s)', array($maxHumanFileSize));
 
-		return array('uploadMaxFilesize' => $maxUploadFilesize,
-					 'maxHumanFilesize'  => $maxHumanFilesize,
+		return array('uploadMaxFilesize' => $maxUploadFileSize,
+					 'maxHumanFilesize'  => $maxHumanFileSize,
 					 'freeSpace' => $storageInfo['free'],
 					 'usedSpacePercent'  => (int)$storageInfo['relative']);
 	}
@@ -27,20 +36,11 @@ class Helper
 	 */
 	public static function determineIcon($file) {
 		if($file['type'] === 'dir') {
-			$dir = $file['directory'];
 			$icon = \OC_Helper::mimetypeIcon('dir');
-			$absPath = $file->getPath();
-			$mount = \OC\Files\Filesystem::getMountManager()->find($absPath);
-			if (!is_null($mount)) {
-				$sid = $mount->getStorageId();
-				if (!is_null($sid)) {
-					$sid = explode(':', $sid);
-					if ($sid[0] === 'shared') {
-						$icon = \OC_Helper::mimetypeIcon('dir-shared');
-					} elseif ($sid[0] !== 'local' and $sid[0] !== 'home') {
-						$icon = \OC_Helper::mimetypeIcon('dir-external');
-					}
-				}
+			if ($file->isShared()) {
+				$icon = \OC_Helper::mimetypeIcon('dir-shared');
+			} elseif ($file->isMounted()) {
+				$icon = \OC_Helper::mimetypeIcon('dir-external');
 			}
 		}else{
 			$icon = \OC_Helper::mimetypeIcon($file->getMimetype());
@@ -57,7 +57,7 @@ class Helper
 	 * @param \OCP\Files\FileInfo $b file
 	 * @return int -1 if $a must come before $b, 1 otherwise
 	 */
-	public static function fileCmp($a, $b) {
+	public static function compareFileNames($a, $b) {
 		$aType = $a->getType();
 		$bType = $b->getType();
 		if ($aType === 'dir' and $bType !== 'dir') {
@@ -69,6 +69,32 @@ class Helper
 		}
 	}
 
+	/**
+	 * Comparator function to sort files by date
+	 *
+	 * @param \OCP\Files\FileInfo $a file
+	 * @param \OCP\Files\FileInfo $b file
+	 * @return int -1 if $a must come before $b, 1 otherwise
+	 */
+	public static function compareTimestamp($a, $b) {
+		$aTime = $a->getMTime();
+		$bTime = $b->getMTime();
+		return $aTime - $bTime;
+	}
+
+	/**
+	 * Comparator function to sort files by size
+	 *
+	 * @param \OCP\Files\FileInfo $a file
+	 * @param \OCP\Files\FileInfo $b file
+	 * @return int -1 if $a must come before $b, 1 otherwise
+	 */
+	public static function compareSize($a, $b) {
+		$aSize = $a->getSize();
+		$bSize = $b->getSize();
+		return $aSize - $bSize;
+	}
+
 	/**
 	 * Formats the file info to be returned as JSON to the client.
 	 *
@@ -120,12 +146,35 @@ class Helper
 	 * returns it as a sorted array of FileInfo.
 	 *
 	 * @param string $dir path to the directory
+	 * @param string $sortAttribute attribute to sort on
+	 * @param bool $sortDescending true for descending sort, false otherwise
 	 * @return \OCP\Files\FileInfo[] files
 	 */
-	public static function getFiles($dir) {
+	public static function getFiles($dir, $sortAttribute = 'name', $sortDescending = false) {
 		$content = \OC\Files\Filesystem::getDirectoryContent($dir);
 
-		usort($content, array('\OCA\Files\Helper', 'fileCmp'));
-		return $content;
+		return self::sortFiles($content, $sortAttribute, $sortDescending);
+	}
+
+	/**
+	 * Sort the given file info array
+	 *
+	 * @param \OCP\Files\FileInfo[] $files files to sort
+	 * @param string $sortAttribute attribute to sort on
+	 * @param bool $sortDescending true for descending sort, false otherwise
+	 * @return \OCP\Files\FileInfo[] sorted files
+	 */
+	public static function sortFiles($files, $sortAttribute = 'name', $sortDescending = false) {
+		$sortFunc = 'compareFileNames';
+		if ($sortAttribute === 'mtime') {
+			$sortFunc = 'compareTimestamp';
+		} else if ($sortAttribute === 'size') {
+			$sortFunc = 'compareSize';
+		}
+		usort($files, array('\OCA\Files\Helper', $sortFunc));
+		if ($sortDescending) {
+			$files = array_reverse($files);
+		}
+		return $files;
 	}
 }
diff --git a/apps/files/list.php b/apps/files/list.php
new file mode 100644
index 0000000000..e583839b25
--- /dev/null
+++ b/apps/files/list.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * ownCloud - Files list
+ *
+ * @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/>.
+ *
+ */
+
+// Check if we are a user
+OCP\User::checkLoggedIn();
+
+$config = \OC::$server->getConfig();
+// TODO: move this to the generated config.js
+$publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes');
+$uploadLimit=OCP\Util::uploadLimit();
+
+// renders the controls and table headers template
+$tmpl = new OCP\Template('files', 'list', '');
+$tmpl->assign('uploadLimit', $uploadLimit); // PHP upload limit
+$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
+$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+$tmpl->printPage();
+
diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php
new file mode 100644
index 0000000000..86436bbe8c
--- /dev/null
+++ b/apps/files/templates/appnavigation.php
@@ -0,0 +1,17 @@
+<div id="app-navigation">
+	<ul>
+		<?php foreach ($_['navigationItems'] as $item) { ?>
+		<li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?>"><a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>"><?php p($item['name']);?></a></li>
+		<?php } ?>
+	</ul>
+	<div id="app-settings">
+		<div id="app-settings-header">
+			<button class="settings-button"></button>
+		</div>
+		<div id="app-settings-content">
+				<h2><?php p($l->t('WebDAV'));?></h2>
+				<div><input id="webdavurl" type="text" readonly="readonly" value="<?php p(OC_Helper::linkToRemote('webdav')); ?>"></input></div>
+				<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>
+		</div>
+	</div>
+</div>
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index a8437835d9..8cab4ce220 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -1,115 +1,15 @@
-<div id="controls">
-		<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 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 svg"
-						data-type="folder" data-newname="<?php p($l->t('New folder')) ?>">
-						<p><?php p($l->t('Folder'));?></p>
-					</li>
-					<li class="icon-link svg" data-type="web">
-						<p><?php p($l->t('From link'));?></p>
-					</li>
-				</ul>
-			</div>
-			<?php endif;?>
-			<div id="upload" class="button"
-				 title="<?php p($l->t('Upload (max. %s)', array($_['uploadMaxHumanFilesize']))) ?>">
-					<?php if($_['uploadMaxFilesize'] >= 0):?>
-					<input type="hidden" id="max_upload" name="MAX_FILE_SIZE" value="<?php p($_['uploadMaxFilesize']) ?>">
-					<?php endif;?>
-					<input type="hidden" id="upload_limit" value="<?php p($_['uploadLimit']) ?>">
-					<input type="hidden" id="free_space" value="<?php p($_['freeSpace']) ?>">
-					<?php if(isset($_['dirToken'])):?>
-					<input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
-					<input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
-					<?php endif;?>
-					<input type="hidden" class="max_human_file_size"
-						   value="(max <?php p($_['uploadMaxHumanFilesize']); ?>)">
-					<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
-					<input type="file" id="file_upload_start" name='files[]'
-						   data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" />
-					<a href="#" class="svg icon-upload"></a>
-			</div>
-			<?php if ($_['trash']): ?>
-			<input id="trash" type="button" value="<?php p($l->t('Deleted files'));?>" class="button" <?php $_['trashEmpty'] ? p('disabled') : '' ?> />
-			<?php endif; ?>
-			<div id="uploadprogresswrapper">
-				<div id="uploadprogressbar"></div>
-				<input type="button" class="stop" style="display:none"
-					value="<?php p($l->t('Cancel upload'));?>"
-				/>
-			</div>
-		</div>
-		<div id="file_action_panel"></div>
-		<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" 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 class="hidden" id='headerName'>
-				<div id="headerName-container">
-					<input type="checkbox" id="select_all" />
-					<label for="select_all"></label>
-					<span class="name"><?php p($l->t( 'Name' )); ?></span>
-					<span id="selectedActionsList" class="selectedActions">
-						<?php if($_['allowZipDownload']) : ?>
-							<a href="" class="download">
-								<img class="svg" alt="Download"
-									 src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>" />
-								<?php p($l->t('Download'))?>
-							</a>
-						<?php endif; ?>
-					</span>
-				</div>
-			</th>
-			<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">
-						<?php p($l->t('Delete'))?>
-						<img class="svg" alt="<?php p($l->t('Delete'))?>"
-							 src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" />
-					</a></span>
-				<?php endif; ?>
-			</th>
-		</tr>
-	</thead>
-	<tbody id="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! -->
-<div id="uploadsize-message" title="<?php p($l->t('Upload too large'))?>">
-	<p>
-	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.'));?>
-	</p>
-</div>
-<div id="scanning-message">
-	<h3>
-		<?php p($l->t('Files are being scanned, please wait.'));?> <span id='scan-count'></span>
-	</h3>
-	<p>
-		<?php p($l->t('Current scanning'));?> <span id='scan-current'></span>
-	</p>
-</div>
+<?php /** @var $l OC_L10N */ ?>
+<?php $_['appNavigation']->printPage(); ?>
+<div id="app-content">
+	<?php foreach ($_['appContents'] as $content) { ?>
+	<div id="app-content-<?php p($content['id']) ?>" class="hidden">
+	<?php print_unescaped($content['content']) ?>
+	</div>
+	<?php } ?>
+</div><!-- closing app-content -->
 
 <!-- config hints for javascript -->
 <input type="hidden" name="filesApp" id="filesApp" value="1" />
-<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']) :?>
 <input type="hidden" name="encryptedFiles" id="encryptedFiles" value="<?php $_['encryptedFiles'] ? p('1') : p('0'); ?>" />
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
new file mode 100644
index 0000000000..8f11f965b2
--- /dev/null
+++ b/apps/files/templates/list.php
@@ -0,0 +1,107 @@
+<div id="controls">
+		<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 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 svg"
+						data-type="folder" data-newname="<?php p($l->t('New folder')) ?>">
+						<p><?php p($l->t('Folder'));?></p>
+					</li>
+					<li class="icon-link svg" data-type="web">
+						<p><?php p($l->t('From link'));?></p>
+					</li>
+				</ul>
+			</div>
+			<?php endif;?>
+			<?php /* Note: the template attributes are here only for the public page. These are normally loaded
+					 through ajax instead (updateStorageStatistics).
+			*/ ?>
+			<div id="upload" class="button"
+				 title="<?php isset($_['uploadMaxHumanFilesize']) ? p($l->t('Upload (max. %s)', array($_['uploadMaxHumanFilesize']))) : '' ?>">
+					<input type="hidden" id="max_upload" name="MAX_FILE_SIZE" value="<?php isset($_['uploadMaxFilesize']) ? p($_['uploadMaxFilesize']) : '' ?>">
+					<input type="hidden" id="upload_limit" value="<?php isset($_['uploadLimit']) ? p($_['uploadLimit']) : '' ?>">
+					<input type="hidden" id="free_space" value="<?php isset($_['freeSpace']) ? p($_['freeSpace']) : '' ?>">
+					<?php if(isset($_['dirToken'])):?>
+					<input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
+					<input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
+					<?php endif;?>
+					<input type="hidden" class="max_human_file_size"
+						   value="(max <?php isset($_['uploadMaxHumanFilesize']) ? p($_['uploadMaxHumanFilesize']) : ''; ?>)">
+					<input type="file" id="file_upload_start" name='files[]'
+						   data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" />
+					<a href="#" class="svg icon-upload"></a>
+			</div>
+			<div id="uploadprogresswrapper">
+				<div id="uploadprogressbar"></div>
+				<input type="button" class="stop" style="display:none"
+					value="<?php p($l->t('Cancel upload'));?>"
+				/>
+			</div>
+		</div>
+		<div id="file_action_panel"></div>
+		<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="" id="permissions">
+</div>
+
+<div id="emptycontent" class="hidden"><?php p($l->t('Nothing in here. Upload something!'))?></div>
+
+<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>" data-preview-x="36" data-preview-y="36">
+	<thead>
+		<tr>
+			<th id='headerName' class="hidden column-name">
+				<div id="headerName-container">
+					<input type="checkbox" id="select_all_files" class="select-all"/>
+					<label for="select_all_files"></label>
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+					<span id="selectedActionsList" class="selectedActions">
+						<?php if($_['allowZipDownload']) : ?>
+							<a href="" class="download">
+								<img class="svg" alt="Download"
+									 src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>" />
+								<?php p($l->t('Download'))?>
+							</a>
+						<?php endif; ?>
+					</span>
+				</div>
+			</th>
+			<th id="headerSize" class="hidden column-size">
+				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
+			</th>
+			<th id="headerDate" class="hidden column-mtime">
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
+					<span class="selectedActions"><a href="" class="delete-selected">
+						<?php p($l->t('Delete'))?>
+						<img class="svg" alt="<?php p($l->t('Delete'))?>"
+							 src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" />
+					</a></span>
+			</th>
+		</tr>
+	</thead>
+	<tbody id="fileList">
+	</tbody>
+	<tfoot>
+	</tfoot>
+</table>
+<input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" />
+<input type="hidden" name="dir" id="dir" value="" />
+<div id="editor"></div><!-- FIXME Do not use this div in your app! It is deprecated and will be removed in the future! -->
+<div id="uploadsize-message" title="<?php p($l->t('Upload too large'))?>">
+	<p>
+	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.'));?>
+	</p>
+</div>
+<div id="scanning-message">
+	<h3>
+		<?php p($l->t('Files are being scanned, please wait.'));?> <span id='scan-count'></span>
+	</h3>
+	<p>
+		<?php p($l->t('Current scanning'));?> <span id='scan-current'></span>
+	</p>
+</div>
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index 74ca1e4495..9928053e50 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -24,6 +24,16 @@
 class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
 	private static $user;
 
+	/**
+	 * @var PHPUnit_Framework_MockObject_MockObject
+	 */
+	private $viewMock;
+
+	/**
+	 * @var \OCA\Files\App
+	 */
+	private $files;
+
 	function setUp() {
 		// mock OC_L10n
 		if (!self::$user) {
@@ -56,7 +66,7 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @brief test rename of file/folder
+	 * test rename of file/folder
 	 */
 	function testRenameFolder() {
 		$dir = '/';
@@ -72,7 +82,7 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
 			->method('getFileInfo')
 			->will($this->returnValue(new \OC\Files\FileInfo(
 				'/',
-				null,
+				new \OC\Files\Storage\Local(array('datadir' => '/')),
 				'/',
 				array(
 				'fileid' => 123,
diff --git a/apps/files/tests/helper.php b/apps/files/tests/helper.php
new file mode 100644
index 0000000000..9b3603cd56
--- /dev/null
+++ b/apps/files/tests/helper.php
@@ -0,0 +1,98 @@
+<?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.
+ */
+
+require_once __DIR__ . '/../lib/helper.php';
+
+use OCA\Files;
+
+/**
+ * Class Test_Files_Helper
+ */
+class Test_Files_Helper extends \PHPUnit_Framework_TestCase {
+
+	private function makeFileInfo($name, $size, $mtime, $isDir = false) {
+		return new \OC\Files\FileInfo(
+			'/',
+			null,
+			'/',
+			array(
+				'name' => $name,
+				'size' => $size,
+				'mtime' => $mtime,
+				'type' => $isDir ? 'dir' : 'file',
+				'mimetype' => $isDir ? 'httpd/unix-directory' : 'application/octet-stream'
+			)	
+		);
+	}
+
+	/**
+	 * Returns a file list for testing
+	 */
+	private function getTestFileList() {
+		return array(
+			self::makeFileInfo('a.txt', 4, 1000),
+			self::makeFileInfo('q.txt', 5, 150),
+			self::makeFileInfo('subdir2', 87, 128, true),
+			self::makeFileInfo('b.txt', 166, 800),
+			self::makeFileInfo('o.txt', 12, 100),
+			self::makeFileInfo('subdir', 88, 125, true),
+		);
+	}
+
+	function sortDataProvider() {
+		return array(
+			array(
+				'name',
+				false,
+				array('subdir', 'subdir2', 'a.txt', 'b.txt', 'o.txt', 'q.txt'),
+			),
+			array(
+				'name',
+				true,
+				array('q.txt', 'o.txt', 'b.txt', 'a.txt', 'subdir2', 'subdir'),
+			),
+			array(
+				'size',
+				false,
+				array('a.txt', 'q.txt', 'o.txt', 'subdir2', 'subdir', 'b.txt'),
+			),
+			array(
+				'size',
+				true,
+				array('b.txt', 'subdir', 'subdir2', 'o.txt', 'q.txt', 'a.txt'),
+			),
+			array(
+				'mtime',
+				false,
+				array('o.txt', 'subdir', 'subdir2', 'q.txt', 'b.txt', 'a.txt'),
+			),
+			array(
+				'mtime',
+				true,
+				array('a.txt', 'b.txt', 'q.txt', 'subdir2', 'subdir', 'o.txt'),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider sortDataProvider
+	 */
+	public function testSortByName($sort, $sortDescending, $expectedOrder) {
+		$files = self::getTestFileList();
+		$files = \OCA\Files\Helper::sortFiles($files, $sort, $sortDescending);
+		$fileNames = array();
+		foreach ($files as $fileInfo) {
+			$fileNames[] = $fileInfo->getName();
+		}
+		$this->assertEquals(
+			$expectedOrder,
+			$fileNames
+		);	
+	}
+
+}
diff --git a/apps/files/tests/js/appSpec.js b/apps/files/tests/js/appSpec.js
new file mode 100644
index 0000000000..0e9abad698
--- /dev/null
+++ b/apps/files/tests/js/appSpec.js
@@ -0,0 +1,220 @@
+/**
+* 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/>.
+*
+*/
+
+describe('OCA.Files.App tests', function() {
+	var App = OCA.Files.App;
+	var pushStateStub;
+	var parseUrlQueryStub;
+
+	beforeEach(function() {
+		$('#testArea').append(
+			'<div id="content" class="app-files">' +
+			'<div id="app-navigation">' +
+			'<ul><li data-id="files"><a>Files</a></li>' +
+			'<li data-id="other"><a>Other</a></li>' +
+			'</div>' +
+			'<div id="app-content">' +
+			'<div id="app-content-files" class="hidden">' +
+			'</div>' +
+			'<div id="app-content-other" class="hidden">' +
+			'</div>' +
+			'</div>' +
+			'</div>' +
+			'</div>'
+		);
+
+		pushStateStub = sinon.stub(OC.Util.History, 'pushState');
+		parseUrlQueryStub = sinon.stub(OC.Util.History, 'parseUrlQuery');
+		parseUrlQueryStub.returns({});
+
+		App.initialize();
+	});
+	afterEach(function() {
+		App.navigation = null;
+		App.fileList = null;
+		App.files = null;
+		App.fileActions.clear();
+		App.fileActions = null;
+
+		pushStateStub.restore();
+		parseUrlQueryStub.restore();
+	});
+
+	describe('initialization', function() {
+		it('initializes the default file list with the default file actions', function() {
+			expect(App.fileList).toBeDefined();
+			expect(App.fileList.fileActions.actions.all).toBeDefined();
+			expect(App.fileList.$el.is('#app-content-files')).toEqual(true);
+		});
+	});
+
+	describe('URL handling', function() {
+		it('pushes the state to the URL when current app changed directory', function() {
+			$('#app-content-files').trigger(new $.Event('changeDirectory', {dir: 'subdir'}));
+			expect(pushStateStub.calledOnce).toEqual(true);
+			expect(pushStateStub.getCall(0).args[0].dir).toEqual('subdir');
+			expect(pushStateStub.getCall(0).args[0].view).not.toBeDefined();
+
+			$('li[data-id=other]>a').click();
+			pushStateStub.reset();
+
+			$('#app-content-other').trigger(new $.Event('changeDirectory', {dir: 'subdir'}));
+			expect(pushStateStub.calledOnce).toEqual(true);
+			expect(pushStateStub.getCall(0).args[0].dir).toEqual('subdir');
+			expect(pushStateStub.getCall(0).args[0].view).toEqual('other');
+		});
+		describe('onpopstate', function() {
+			it('sends "urlChanged" event to current app', function() {
+				var handler = sinon.stub();
+				$('#app-content-files').on('urlChanged', handler);
+				App._onPopState({view: 'files', dir: '/somedir'});
+				expect(handler.calledOnce).toEqual(true);
+				expect(handler.getCall(0).args[0].view).toEqual('files');
+				expect(handler.getCall(0).args[0].dir).toEqual('/somedir');
+			});
+			it('sends "show" event to current app and sets navigation', function() {
+				var showHandlerFiles = sinon.stub();
+				var showHandlerOther = sinon.stub();
+				var hideHandlerFiles = sinon.stub();
+				var hideHandlerOther = sinon.stub();
+				$('#app-content-files').on('show', showHandlerFiles);
+				$('#app-content-files').on('hide', hideHandlerFiles);
+				$('#app-content-other').on('show', showHandlerOther);
+				$('#app-content-other').on('hide', hideHandlerOther);
+				App._onPopState({view: 'other', dir: '/somedir'});
+				expect(showHandlerFiles.notCalled).toEqual(true);
+				expect(hideHandlerFiles.calledOnce).toEqual(true);
+				expect(showHandlerOther.calledOnce).toEqual(true);
+				expect(hideHandlerOther.notCalled).toEqual(true);
+
+				showHandlerFiles.reset();
+				showHandlerOther.reset();
+				hideHandlerFiles.reset();
+				hideHandlerOther.reset();
+
+				App._onPopState({view: 'files', dir: '/somedir'});
+				expect(showHandlerFiles.calledOnce).toEqual(true);
+				expect(hideHandlerFiles.notCalled).toEqual(true);
+				expect(showHandlerOther.notCalled).toEqual(true);
+				expect(hideHandlerOther.calledOnce).toEqual(true);
+
+				expect(App.navigation.getActiveItem()).toEqual('files');
+				expect($('#app-content-files').hasClass('hidden')).toEqual(false);
+				expect($('#app-content-other').hasClass('hidden')).toEqual(true);
+			});
+			it('does not send "show" or "hide" event to current app when already visible', function() {
+				var showHandler = sinon.stub();
+				var hideHandler = sinon.stub();
+				$('#app-content-files').on('show', showHandler);
+				$('#app-content-files').on('hide', hideHandler);
+				App._onPopState({view: 'files', dir: '/somedir'});
+				expect(showHandler.notCalled).toEqual(true);
+				expect(hideHandler.notCalled).toEqual(true);
+			});
+			it('state defaults to files app with root dir', function() {
+				var handler = sinon.stub();
+				parseUrlQueryStub.returns({});
+				$('#app-content-files').on('urlChanged', handler);
+				App._onPopState();
+				expect(handler.calledOnce).toEqual(true);
+				expect(handler.getCall(0).args[0].view).toEqual('files');
+				expect(handler.getCall(0).args[0].dir).toEqual('/');
+			});
+			it('activates files app if invalid view is passed', function() {
+				App._onPopState({view: 'invalid', dir: '/somedir'});
+
+				expect(App.navigation.getActiveItem()).toEqual('files');
+				expect($('#app-content-files').hasClass('hidden')).toEqual(false);
+			});
+		});
+		describe('navigation', function() {
+			it('switches the navigation item and panel visibility when onpopstate', function() {
+				App._onPopState({view: 'other', dir: '/somedir'});
+				expect(App.navigation.getActiveItem()).toEqual('other');
+				expect($('#app-content-files').hasClass('hidden')).toEqual(true);
+				expect($('#app-content-other').hasClass('hidden')).toEqual(false);
+				expect($('li[data-id=files]').hasClass('selected')).toEqual(false);
+				expect($('li[data-id=other]').hasClass('selected')).toEqual(true);
+
+				App._onPopState({view: 'files', dir: '/somedir'});
+
+				expect(App.navigation.getActiveItem()).toEqual('files');
+				expect($('#app-content-files').hasClass('hidden')).toEqual(false);
+				expect($('#app-content-other').hasClass('hidden')).toEqual(true);
+				expect($('li[data-id=files]').hasClass('selected')).toEqual(true);
+				expect($('li[data-id=other]').hasClass('selected')).toEqual(false);
+			});
+			it('clicking on navigation switches the panel visibility', function() {
+				$('li[data-id=other]>a').click();
+				expect(App.navigation.getActiveItem()).toEqual('other');
+				expect($('#app-content-files').hasClass('hidden')).toEqual(true);
+				expect($('#app-content-other').hasClass('hidden')).toEqual(false);
+				expect($('li[data-id=files]').hasClass('selected')).toEqual(false);
+				expect($('li[data-id=other]').hasClass('selected')).toEqual(true);
+
+				$('li[data-id=files]>a').click();
+				expect(App.navigation.getActiveItem()).toEqual('files');
+				expect($('#app-content-files').hasClass('hidden')).toEqual(false);
+				expect($('#app-content-other').hasClass('hidden')).toEqual(true);
+				expect($('li[data-id=files]').hasClass('selected')).toEqual(true);
+				expect($('li[data-id=other]').hasClass('selected')).toEqual(false);
+			});
+			it('clicking on navigation sends "show" and "urlChanged" event', function() {
+				var handler = sinon.stub();
+				var showHandler = sinon.stub();
+				$('#app-content-other').on('urlChanged', handler);
+				$('#app-content-other').on('show', showHandler);
+				$('li[data-id=other]>a').click();
+				expect(handler.calledOnce).toEqual(true);
+				expect(handler.getCall(0).args[0].view).toEqual('other');
+				expect(handler.getCall(0).args[0].dir).toEqual('/');
+				expect(showHandler.calledOnce).toEqual(true);
+			});
+			it('clicking on activate navigation only sends "urlChanged" event', function() {
+				var handler = sinon.stub();
+				var showHandler = sinon.stub();
+				$('#app-content-files').on('urlChanged', handler);
+				$('#app-content-files').on('show', showHandler);
+				$('li[data-id=files]>a').click();
+				expect(handler.calledOnce).toEqual(true);
+				expect(handler.getCall(0).args[0].view).toEqual('files');
+				expect(handler.getCall(0).args[0].dir).toEqual('/');
+				expect(showHandler.notCalled).toEqual(true);
+			});
+		});
+		describe('viewer mode', function() {
+			it('toggles the sidebar when viewer mode is enabled', function() {
+				$('#app-content-files').trigger(
+					new $.Event('changeViewerMode', {viewerModeEnabled: true}
+				));
+				expect($('#app-navigation').hasClass('hidden')).toEqual(true);
+				expect($('.app-files').hasClass('viewer-mode no-sidebar')).toEqual(true);
+
+				$('#app-content-files').trigger(
+					new $.Event('changeViewerMode', {viewerModeEnabled: false}
+				));
+
+				expect($('#app-navigation').hasClass('hidden')).toEqual(false);
+				expect($('.app-files').hasClass('viewer-mode no-sidebar')).toEqual(false);
+			});
+		});
+	});
+});
diff --git a/apps/files/tests/js/breadcrumbSpec.js b/apps/files/tests/js/breadcrumbSpec.js
index 1bfe5308a2..e3d9c757a7 100644
--- a/apps/files/tests/js/breadcrumbSpec.js
+++ b/apps/files/tests/js/breadcrumbSpec.js
@@ -20,7 +20,9 @@
 */
 
 /* global BreadCrumb */
-describe('BreadCrumb tests', function() {
+describe('OCA.Files.BreadCrumb tests', function() {
+	var BreadCrumb = OCA.Files.BreadCrumb;
+
 	describe('Rendering', function() {
 		var bc;
 		beforeEach(function() {
diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js
index 3c22c84b86..9152dbb58c 100644
--- a/apps/files/tests/js/fileactionsSpec.js
+++ b/apps/files/tests/js/fileactionsSpec.js
@@ -19,34 +19,45 @@
 *
 */
 
-/* global OC, FileActions, FileList */
-describe('FileActions tests', function() {
-	var $filesTable;
+describe('OCA.Files.FileActions tests', function() {
+	var $filesTable, fileList;
+	var FileActions = OCA.Files.FileActions;
 
 	beforeEach(function() {
 		// init horrible parameters
-		var $body = $('body');
+		var $body = $('#testArea');
 		$body.append('<input type="hidden" id="dir" value="/subdir"></input>');
 		$body.append('<input type="hidden" id="permissions" value="31"></input>');
 		// dummy files table
 		$filesTable = $body.append('<table id="filestable"></table>');
+		fileList = new OCA.Files.FileList($('#testArea'));
+		FileActions.registerDefaultActions(fileList);
 	});
 	afterEach(function() {
+		FileActions.clear();
+		fileList = undefined;
 		$('#dir, #permissions, #filestable').remove();
 	});
+	it('calling clear() clears file actions', function() {
+		FileActions.clear();
+		expect(FileActions.actions).toEqual({});
+		expect(FileActions.defaults).toEqual({});
+		expect(FileActions.icons).toEqual({});
+		expect(FileActions.currentFile).toBe(null);
+	});
 	it('calling display() sets file actions', function() {
 		var fileData = {
 			id: 18,
 			type: 'file',
 			name: 'testName.txt',
-			mimetype: 'plain/text',
+			mimetype: 'text/plain',
 			size: '1234',
 			etag: 'a01234c',
 			mtime: '123456'
 		};
 
 		// note: FileActions.display() is called implicitly
-		var $tr = FileList.add(fileData);
+		var $tr = fileList.add(fileData);
 
 		// actions defined after call
 		expect($tr.find('.action.action-download').length).toEqual(1);
@@ -60,12 +71,12 @@ describe('FileActions tests', function() {
 			id: 18,
 			type: 'file',
 			name: 'testName.txt',
-			mimetype: 'plain/text',
+			mimetype: 'text/plain',
 			size: '1234',
 			etag: 'a01234c',
 			mtime: '123456'
 		};
-		var $tr = FileList.add(fileData);
+		var $tr = fileList.add(fileData);
 
 		FileActions.display($tr.find('td.filename'), true);
 		FileActions.display($tr.find('td.filename'), true);
@@ -81,12 +92,12 @@ describe('FileActions tests', function() {
 			id: 18,
 			type: 'file',
 			name: 'testName.txt',
-			mimetype: 'plain/text',
+			mimetype: 'text/plain',
 			size: '1234',
 			etag: 'a01234c',
 			mtime: '123456'
 		};
-		var $tr = FileList.add(fileData);
+		var $tr = fileList.add(fileData);
 		FileActions.display($tr.find('td.filename'), true);
 
 		$tr.find('.action-download').click();
@@ -96,17 +107,17 @@ describe('FileActions tests', function() {
 		redirectStub.restore();
 	});
 	it('deletes file when clicking delete', function() {
-		var deleteStub = sinon.stub(FileList, 'do_delete');
+		var deleteStub = sinon.stub(fileList, 'do_delete');
 		var fileData = {
 			id: 18,
 			type: 'file',
 			name: 'testName.txt',
-			mimetype: 'plain/text',
+			mimetype: 'text/plain',
 			size: '1234',
 			etag: 'a01234c',
 			mtime: '123456'
 		};
-		var $tr = FileList.add(fileData);
+		var $tr = fileList.add(fileData);
 		FileActions.display($tr.find('td.filename'), true);
 
 		$tr.find('.action.delete').click();
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index ca85a360cf..bfc983c748 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -19,27 +19,45 @@
 *
 */
 
-/* global OC, FileList */
-describe('FileList tests', function() {
-	var testFiles, alertStub, notificationStub,
-		pushStateStub;
+describe('OCA.Files.FileList tests', function() {
+	var testFiles, alertStub, notificationStub, fileList;
+	var FileActions = OCA.Files.FileActions;
+
+	/**
+	 * Generate test file data
+	 */
+	function generateFiles(startIndex, endIndex) {
+		var files = [];
+		var name;
+		for (var i = startIndex; i <= endIndex; i++) {
+			name = 'File with index ';
+			if (i < 10) {
+				// do not rely on localeCompare here
+				// and make the sorting predictable
+				// cross-browser
+				name += '0';
+			}
+			name += i + '.txt';
+			files.push({
+				id: i,
+				type: 'file',
+				name: name,
+				mimetype: 'text/plain',
+				size: i * 2,
+				etag: 'abc'
+			});
+		}
+		return files;
+	}
 
 	beforeEach(function() {
-		// init horrible parameters
-		var $body = $('body');
-		$body.append('<input type="hidden" id="dir" value="/subdir"></input>');
-		$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(
+			'<div id="app-content-files">' +
+			// init horrible parameters
 			'<input type="hidden" id="dir" value="/subdir"></input>' +
 			'<input type="hidden" id="permissions" value="31"></input>' +
 			// dummy controls
@@ -48,11 +66,24 @@ describe('FileList tests', function() {
 			'   <div class="notCreatable"></div>' +
 			'</div>' +
 			// dummy table
+			// TODO: at some point this will be rendered by the fileList class itself!
 			'<table id="filestable">' +
-			'<thead><tr><th class="hidden">Name</th></tr></thead>' +
-		   	'<tbody id="fileList"></tbody>' +
+			'<thead><tr>' +
+			'<th id="headerName" class="hidden column-name">' +
+			'<input type="checkbox" id="select_all_files" class="select-all">' +
+			'<a class="name columntitle" data-sort="name"><span>Name</span><span class="sort-indicator"></span></a>' +
+			'<span class="selectedActions hidden">' +
+			'<a href class="download">Download</a>' +
+			'<a href class="delete-selected">Delete</a></span>' +
+			'</th>' +
+			'<th class="hidden column-size"><a class="columntitle" data-sort="size"><span class="sort-indicator"></span></a></th>' +
+			'<th class="hidden column-mtime"><a class="columntitle" data-sort="mtime"><span class="sort-indicator"></span></a></th>' +
+			'</tr></thead>' +
+			'<tbody id="fileList"></tbody>' +
+			'<tfoot></tfoot>' +
 			'</table>' +
-			'<div id="emptycontent">Empty content message</div>'
+			'<div id="emptycontent">Empty content message</div>' +
+			'</div>'
 		);
 
 		testFiles = [{
@@ -60,48 +91,52 @@ describe('FileList tests', function() {
 			type: 'file',
 			name: 'One.txt',
 			mimetype: 'text/plain',
-			size: 12
+			size: 12,
+			etag: 'abc'
 		}, {
 			id: 2,
 			type: 'file',
 			name: 'Two.jpg',
 			mimetype: 'image/jpeg',
-			size: 12049
+			size: 12049,
+			etag: 'def',
 		}, {
 			id: 3,
 			type: 'file',
 			name: 'Three.pdf',
 			mimetype: 'application/pdf',
-			size: 58009
+			size: 58009,
+			etag: '123',
 		}, {
 			id: 4,
 			type: 'dir',
 			name: 'somedir',
 			mimetype: 'httpd/unix-directory',
-			size: 250
+			size: 250,
+			etag: '456'
 		}];
 
-		FileList.initialize();
+		fileList = new OCA.Files.FileList($('#app-content-files'));
+		FileActions.clear();
+		FileActions.registerDefaultActions(fileList);
+		fileList.setFileActions(FileActions);
 	});
 	afterEach(function() {
 		testFiles = undefined;
-		FileList.initialized = false;
-		FileList.isEmpty = true;
-		delete FileList._reloadCall;
+		fileList = undefined;
 
-		$('#dir, #permissions, #filestable').remove();
+		FileActions.clear();
 		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');
+			expect(fileList.getCurrentDirectory()).toEqual('/one/two/three');
 		});
 		it('Returns the directory permissions as int', function() {
 			$('#permissions').val('23');
-			expect(FileList.getDirectoryPermissions()).toEqual(23);
+			expect(fileList.getDirectoryPermissions()).toEqual(23);
 		});
 	});
 	describe('Adding files', function() {
@@ -119,12 +154,12 @@ describe('FileList tests', function() {
 				id: 18,
 				type: 'file',
 				name: 'testName.txt',
-				mimetype: 'plain/text',
+				mimetype: 'text/plain',
 				size: '1234',
 				etag: 'a01234c',
 				mtime: '123456'
 			};
-			var $tr = FileList.add(fileData);
+			var $tr = fileList.add(fileData);
 
 			expect($tr).toBeDefined();
 			expect($tr[0].tagName.toLowerCase()).toEqual('tr');
@@ -134,12 +169,14 @@ describe('FileList tests', function() {
 			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-mime')).toEqual('text/plain');
 			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('a.name').attr('href'))
+				.toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=testName.txt');
+			expect($tr.find('.nametext').text().trim()).toEqual('testName.txt');
 
 			expect($tr.find('.filesize').text()).toEqual('1 kB');
-			expect(FileList.findFileEl('testName.txt')[0]).toEqual($tr[0]);
+			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 = {
@@ -151,7 +188,7 @@ describe('FileList tests', function() {
 				etag: 'a01234c',
 				mtime: '123456'
 			};
-			var $tr = FileList.add(fileData);
+			var $tr = fileList.add(fileData);
 
 			expect($tr).toBeDefined();
 			expect($tr[0].tagName.toLowerCase()).toEqual('tr');
@@ -166,7 +203,7 @@ describe('FileList tests', function() {
 
 			expect($tr.find('.filesize').text()).toEqual('1 kB');
 
-			expect(FileList.findFileEl('testFolder')[0]).toEqual($tr[0]);
+			expect(fileList.findFileEl('testFolder')[0]).toEqual($tr[0]);
 		});
 		it('generates file element with default attributes when calling add() with minimal data', function() {
 			var fileData = {
@@ -174,8 +211,8 @@ describe('FileList tests', function() {
 				name: 'testFile.txt'
 			};
 
-		    clock.tick(123456);
-			var $tr = FileList.add(fileData);
+			clock.tick(123456);
+			var $tr = fileList.add(fileData);
 
 			expect($tr).toBeDefined();
 			expect($tr[0].tagName.toLowerCase()).toEqual('tr');
@@ -195,8 +232,8 @@ describe('FileList tests', function() {
 				type: 'dir',
 				name: 'testFolder'
 			};
-		    clock.tick(123456);
-			var $tr = FileList.add(fileData);
+			clock.tick(123456);
+			var $tr = fileList.add(fileData);
 
 			expect($tr).toBeDefined();
 			expect($tr[0].tagName.toLowerCase()).toEqual('tr');
@@ -217,40 +254,81 @@ describe('FileList tests', function() {
 				name: 'testFolder',
 				size: '0'
 			};
-			var $tr = FileList.add(fileData);
+			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() {
+		it('adds new file to the end of the list', function() {
+			var $tr;
 			var fileData = {
 				type: 'file',
-				name: 'P comes after O.txt'
+				name: 'ZZZ.txt'
 			};
-			FileList.setFiles(testFiles);
-			$tr = FileList.add(fileData);
+			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() {
+		it('inserts files in a sorted manner when insert option is enabled', function() {
+			var $tr;
+			for (var i = 0; i < testFiles.length; i++) {
+				fileList.add(testFiles[i]);
+			}
+			expect(fileList.files[0].name).toEqual('somedir');
+			expect(fileList.files[1].name).toEqual('One.txt');
+			expect(fileList.files[2].name).toEqual('Three.pdf');
+			expect(fileList.files[3].name).toEqual('Two.jpg');
+		});
+		it('inserts new file at correct position', function() {
+			var $tr;
 			var fileData = {
 				type: 'file',
 				name: 'P comes after O.txt'
 			};
-			FileList.setFiles(testFiles);
-			$tr = FileList.add(fileData, {insert: true});
+			for (var i = 0; i < testFiles.length; i++) {
+				fileList.add(testFiles[i]);
+			}
+			$tr = fileList.add(fileData);
 			// after "One.txt"
+			expect($tr.index()).toEqual(2);
+			expect(fileList.files[2]).toEqual(fileData);
+		});
+		it('inserts new folder at correct position in insert mode', function() {
+			var $tr;
+			var fileData = {
+				type: 'dir',
+				name: 'somedir2 comes after somedir'
+			};
+			for (var i = 0; i < testFiles.length; i++) {
+				fileList.add(testFiles[i]);
+			}
+			$tr = fileList.add(fileData);
 			expect($tr.index()).toEqual(1);
+			expect(fileList.files[1]).toEqual(fileData);
+		});
+		it('inserts new file at the end correctly', function() {
+			var $tr;
+			var fileData = {
+				type: 'file',
+				name: 'zzz.txt'
+			};
+			for (var i = 0; i < testFiles.length; i++) {
+				fileList.add(testFiles[i]);
+			}
+			$tr = fileList.add(fileData);
+			expect($tr.index()).toEqual(4);
+			expect(fileList.files[4]).toEqual(fileData);
 		});
 		it('removes empty content message and shows summary when adding first file', function() {
+			var $summary;
 			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);
+			fileList.setFiles([]);
+			expect(fileList.isEmpty).toEqual(true);
+			fileList.add(fileData);
+			$summary = $('#filestable .summary');
+			expect($summary.hasClass('hidden')).toEqual(false);
 			// yes, ugly...
 			expect($summary.find('.info').text()).toEqual('0 folders and 1 file');
 			expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true);
@@ -258,45 +336,49 @@ describe('FileList tests', function() {
 			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);
+			expect(fileList.isEmpty).toEqual(false);
 		});
 	});
 	describe('Removing files from the list', function() {
 		it('Removes file from list when calling remove() and updates summary', function() {
+			var $summary;
 			var $removedEl;
-			FileList.setFiles(testFiles);
-			$removedEl = FileList.remove('One.txt');
+			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);
+			expect($('#fileList tr').length).toEqual(3);
+			expect(fileList.files.length).toEqual(3);
+			expect(fileList.findFileEl('One.txt').length).toEqual(0);
 
-			$summary = $('#fileList .summary');
-			expect($summary.length).toEqual(1);
+			$summary = $('#filestable .summary');
+			expect($summary.hasClass('hidden')).toEqual(false);
 			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);
+			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);
+			var $summary;
+			fileList.setFiles([testFiles[0]]);
+			fileList.remove('One.txt');
+			expect($('#fileList tr').length).toEqual(0);
+			expect(fileList.files.length).toEqual(0);
+			expect(fileList.findFileEl('One.txt').length).toEqual(0);
 
-			$summary = $('#fileList .summary');
-			expect($summary.length).toEqual(0);
+			$summary = $('#filestable .summary');
+			expect($summary.hasClass('hidden')).toEqual(true);
 			expect($('#filestable thead th').hasClass('hidden')).toEqual(true);
 			expect($('#emptycontent').hasClass('hidden')).toEqual(false);
-			expect(FileList.isEmpty).toEqual(true);
+			expect(fileList.isEmpty).toEqual(true);
 		});
 	});
 	describe('Deleting files', function() {
 		function doDelete() {
 			var request, query;
 			// note: normally called from FileActions
-			FileList.do_delete(['One.txt', 'Two.jpg']);
+			fileList.do_delete(['One.txt', 'Two.jpg']);
 
 			expect(fakeServer.requests.length).toEqual(1);
 			request = fakeServer.requests[0];
@@ -306,7 +388,8 @@ describe('FileList tests', function() {
 			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);
+			var $summary;
+			fileList.setFiles(testFiles);
 			doDelete();
 
 			fakeServer.requests[0].respond(
@@ -315,25 +398,40 @@ describe('FileList tests', function() {
 				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);
+			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').length).toEqual(2);
 
-			$summary = $('#fileList .summary');
-			expect($summary.length).toEqual(1);
+			$summary = $('#filestable .summary');
+			expect($summary.hasClass('hidden')).toEqual(false);
 			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(fileList.isEmpty).toEqual(false);
 			expect($('#filestable thead th').hasClass('hidden')).toEqual(false);
 			expect($('#emptycontent').hasClass('hidden')).toEqual(true);
 
 			expect(notificationStub.notCalled).toEqual(true);
 		});
+		it('shows spinner on files to be deleted', function() {
+			fileList.setFiles(testFiles);
+			doDelete();
+
+			expect(fileList.findFileEl('One.txt').find('.progress-icon:not(.delete-icon)').length).toEqual(1);
+			expect(fileList.findFileEl('Three.pdf').find('.delete-icon:not(.progress-icon)').length).toEqual(1);
+		});
+		it('shows spinner on all files when deleting all', function() {
+			fileList.setFiles(testFiles);
+
+			fileList.do_delete();
+
+			expect(fileList.$fileList.find('tr .progress-icon:not(.delete-icon)').length).toEqual(4);
+		});
 		it('updates summary when deleting last file', function() {
-			FileList.setFiles([testFiles[0], testFiles[1]]);
+			var $summary;
+			fileList.setFiles([testFiles[0], testFiles[1]]);
 			doDelete();
 
 			fakeServer.requests[0].respond(
@@ -342,16 +440,17 @@ describe('FileList tests', function() {
 				JSON.stringify({status: 'success'})
 			);
 
-			expect(FileList.$fileList.find('tr:not(.summary)').length).toEqual(0);
+			expect(fileList.$fileList.find('tr').length).toEqual(0);
 
-			$summary = $('#fileList .summary');
-			expect($summary.length).toEqual(0);
-			expect(FileList.isEmpty).toEqual(true);
+			$summary = $('#filestable .summary');
+			expect($summary.hasClass('hidden')).toEqual(true);
+			expect(fileList.isEmpty).toEqual(true);
+			expect(fileList.files.length).toEqual(0);
 			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);
+			fileList.setFiles(testFiles);
 			doDelete();
 
 			fakeServer.requests[0].respond(
@@ -361,9 +460,9 @@ describe('FileList tests', function() {
 			);
 
 			// 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(fileList.findFileEl('One.txt').length).toEqual(1);
+			expect(fileList.findFileEl('Two.jpg').length).toEqual(1);
+			expect(fileList.$fileList.find('tr').length).toEqual(4);
 
 			expect(notificationStub.calledOnce).toEqual(true);
 		});
@@ -372,37 +471,43 @@ describe('FileList tests', function() {
 		function doRename() {
 			var $input, request;
 
-			FileList.setFiles(testFiles);
+			for (var i = 0; i < testFiles.length; i++) {
+				fileList.add(testFiles[i]);
+			}
 
 			// trigger rename prompt
-			FileList.rename('One.txt');
-			$input = FileList.$fileList.find('input.filename');
-			$input.val('One_renamed.txt').blur();
+			fileList.rename('One.txt');
+			$input = fileList.$fileList.find('input.filename');
+			$input.val('Tu_after_three.txt');
+			// trigger submit because triggering blur doesn't work in all browsers
+			$input.closest('form').trigger('submit');
 
 			expect(fakeServer.requests.length).toEqual(1);
-			var request = fakeServer.requests[0];
+			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'});
+			expect(OC.parseQueryString(request.url)).toEqual({'dir': '/subdir', newname: 'Tu_after_three.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);
+			expect(fileList.findFileEl('One.txt').length).toEqual(0);
+			expect(fileList.findFileEl('Tu_after_three.txt').length).toEqual(1);
 			// input is gone
-			expect(FileList.$fileList.find('input.filename').length).toEqual(0);
+			expect(fileList.$fileList.find('input.filename').length).toEqual(0);
 		}
-		it('Keeps renamed file entry if rename ajax call suceeded', function() {
+		it('Inserts renamed file entry at correct position 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'
+					name: 'Tu_after_three.txt',
+					type: 'file'
 				}
 			}));
 
 			// element stays renamed
-			expect(FileList.findFileEl('One.txt').length).toEqual(0);
-			expect(FileList.findFileEl('One_renamed.txt').length).toEqual(1);
+			expect(fileList.findFileEl('One.txt').length).toEqual(0);
+			expect(fileList.findFileEl('Tu_after_three.txt').length).toEqual(1);
+			expect(fileList.findFileEl('Tu_after_three.txt').index()).toEqual(2); // after Two.txt
 
 			expect(alertStub.notCalled).toEqual(true);
 		});
@@ -417,8 +522,9 @@ describe('FileList tests', function() {
 			}));
 
 			// element was reverted
-			expect(FileList.findFileEl('One.txt').length).toEqual(1);
-			expect(FileList.findFileEl('One_renamed.txt').length).toEqual(0);
+			expect(fileList.findFileEl('One.txt').length).toEqual(1);
+			expect(fileList.findFileEl('One.txt').index()).toEqual(1); // after somedir
+			expect(fileList.findFileEl('Tu_after_three.txt').length).toEqual(0);
 
 			expect(alertStub.calledOnce).toEqual(true);
 		});
@@ -429,12 +535,12 @@ describe('FileList tests', function() {
 			fakeServer.requests[0].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
 				status: 'success',
 				data: {
-					name: 'One_renamed.txt'
+					name: 'Tu_after_three.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');
+			$tr = fileList.findFileEl('Tu_after_three.txt');
+			expect($tr.find('a.name').attr('href')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=Tu_after_three.txt');
 		});
 		// FIXME: fix this in the source code!
 		xit('Correctly updates file link after rename when path has same name', function() {
@@ -446,56 +552,151 @@ describe('FileList tests', function() {
 			fakeServer.requests[0].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
 				status: 'success',
 				data: {
-					name: 'One_renamed.txt'
+					name: 'Tu_after_three.txt'
 				}
 			}));
 
-			$tr = FileList.findFileEl('One_renamed.txt');
+			$tr = fileList.findFileEl('Tu_after_three.txt');
 			expect($tr.find('a.name').attr('href')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=One.txt');
 		});
 	});
+	describe('Moving files', function() {
+		beforeEach(function() {
+			fileList.setFiles(testFiles);
+		});
+		it('Moves single file to target folder', function() {
+			var request;
+			fileList.move('One.txt', '/somedir');
+
+			expect(fakeServer.requests.length).toEqual(1);
+			request = fakeServer.requests[0];
+			expect(request.url).toEqual(OC.webroot + '/index.php/apps/files/ajax/move.php');
+			expect(OC.parseQueryString(request.requestBody)).toEqual({dir: '/subdir', file: 'One.txt', target: '/somedir'});
+
+			fakeServer.requests[0].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
+				status: 'success',
+				data: {
+					name: 'One.txt',
+					type: 'file'
+				}
+			}));
+
+			expect(fileList.findFileEl('One.txt').length).toEqual(0);
+
+			// folder size has increased
+			expect(fileList.findFileEl('somedir').data('size')).toEqual(262);
+			expect(fileList.findFileEl('somedir').find('.filesize').text()).toEqual('262 B');
+
+			expect(notificationStub.notCalled).toEqual(true);
+		});
+		it('Moves list of files to target folder', function() {
+			var request;
+			fileList.move(['One.txt', 'Two.jpg'], '/somedir');
+
+			expect(fakeServer.requests.length).toEqual(2);
+			request = fakeServer.requests[0];
+			expect(request.url).toEqual(OC.webroot + '/index.php/apps/files/ajax/move.php');
+			expect(OC.parseQueryString(request.requestBody)).toEqual({dir: '/subdir', file: 'One.txt', target: '/somedir'});
+
+			request = fakeServer.requests[1];
+			expect(request.url).toEqual(OC.webroot + '/index.php/apps/files/ajax/move.php');
+			expect(OC.parseQueryString(request.requestBody)).toEqual({dir: '/subdir', file: 'Two.jpg', target: '/somedir'});
+
+			fakeServer.requests[0].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
+				status: 'success',
+				data: {
+					name: 'One.txt',
+					type: 'file'
+				}
+			}));
+
+			expect(fileList.findFileEl('One.txt').length).toEqual(0);
+
+			// folder size has increased
+			expect(fileList.findFileEl('somedir').data('size')).toEqual(262);
+			expect(fileList.findFileEl('somedir').find('.filesize').text()).toEqual('262 B');
+
+			fakeServer.requests[1].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
+				status: 'success',
+				data: {
+					name: 'Two.jpg',
+					type: 'file'
+				}
+			}));
+
+			expect(fileList.findFileEl('Two.jpg').length).toEqual(0);
+
+			// folder size has increased
+			expect(fileList.findFileEl('somedir').data('size')).toEqual(12311);
+			expect(fileList.findFileEl('somedir').find('.filesize').text()).toEqual('12 kB');
+
+			expect(notificationStub.notCalled).toEqual(true);
+		});
+		it('Shows notification if a file could not be moved', function() {
+			var request;
+			fileList.move('One.txt', '/somedir');
+
+			expect(fakeServer.requests.length).toEqual(1);
+			request = fakeServer.requests[0];
+			expect(request.url).toEqual(OC.webroot + '/index.php/apps/files/ajax/move.php');
+			expect(OC.parseQueryString(request.requestBody)).toEqual({dir: '/subdir', file: 'One.txt', target: '/somedir'});
+
+			fakeServer.requests[0].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
+				status: 'error',
+				data: {
+					message: 'Error while moving file',
+				}
+			}));
+
+			expect(fileList.findFileEl('One.txt').length).toEqual(1);
+
+			expect(notificationStub.calledOnce).toEqual(true);
+			expect(notificationStub.getCall(0).args[0]).toEqual('Error while moving file');
+		});
+	});
 	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();
+			expect(fileList.files.length).toEqual(0);
+			expect(fileList.files).toEqual([]);
+			fileList.setFiles(testFiles);
+			expect($('#fileList tr').length).toEqual(4);
+			expect(fileList.files.length).toEqual(4);
+			expect(fileList.files).toEqual(testFiles);
 		});
 		it('updates summary using the file sizes', function() {
 			var $summary;
-			FileList.setFiles(testFiles);
-			$summary = $('#fileList .summary');
-			expect($summary.length).toEqual(1);
+			fileList.setFiles(testFiles);
+			$summary = $('#filestable .summary');
+			expect($summary.hasClass('hidden')).toEqual(false);
 			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);
+			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);
+			expect(fileList.$el.find('.summary').hasClass('hidden')).toEqual(false);
 		});
 		it('hides headers, summary and show empty content message after setting empty file list', function(){
-			FileList.setFiles([]);
+			fileList.setFiles([]);
 			expect($('#filestable thead th').hasClass('hidden')).toEqual(true);
 			expect($('#emptycontent').hasClass('hidden')).toEqual(false);
-			expect(FileList.$fileList.find('.summary').length).toEqual(0);
+			expect(fileList.$el.find('.summary').hasClass('hidden')).toEqual(true);
 		});
 		it('hides headers, empty content message, and summary when list is empty and user has no creation permission', function(){
 			$('#permissions').val(0);
-			FileList.setFiles([]);
+			fileList.setFiles([]);
 			expect($('#filestable thead th').hasClass('hidden')).toEqual(true);
 			expect($('#emptycontent').hasClass('hidden')).toEqual(true);
-			expect(FileList.$fileList.find('.summary').length).toEqual(0);
+			expect(fileList.$el.find('.summary').hasClass('hidden')).toEqual(true);
 		});
 		it('calling findFileEl() can find existing file element', function() {
-			FileList.setFiles(testFiles);
-			expect(FileList.findFileEl('Two.jpg').length).toEqual(1);
+			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);
+			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');
@@ -504,21 +705,126 @@ describe('FileList tests', function() {
 				name: 'testFile.txt',
 				directory: '/current dir'
 			};
-			var $tr = FileList.add(fileData);
-			expect(FileList.findFileEl('testFile.txt').length).toEqual(1);
+			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);
+			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);
+			fileList.$fileList.on('updated', handler);
+			fileList.setFiles(testFiles);
 			expect(handler.calledOnce).toEqual(true);
 		});
+		it('does not update summary when removing non-existing files', function() {
+			var $summary;
+			// single file
+			fileList.setFiles([testFiles[0]]);
+			$summary = $('#filestable .summary');
+			expect($summary.hasClass('hidden')).toEqual(false);
+			expect($summary.find('.info').text()).toEqual('0 folders and 1 file');
+			fileList.remove('unexist.txt');
+			expect($summary.hasClass('hidden')).toEqual(false);
+			expect($summary.find('.info').text()).toEqual('0 folders and 1 file');
+		});
+	});
+	describe('Rendering next page on scroll', function() {
+		beforeEach(function() {
+			fileList.setFiles(generateFiles(0, 64));
+		});
+		it('renders only the first page', function() {
+			expect(fileList.files.length).toEqual(65);
+			expect($('#fileList tr').length).toEqual(20);
+		});
+		it('renders the second page when scrolling down (trigger nextPage)', function() {
+			// TODO: can't simulate scrolling here, so calling nextPage directly
+			fileList._nextPage(true);
+			expect($('#fileList tr').length).toEqual(40);
+			fileList._nextPage(true);
+			expect($('#fileList tr').length).toEqual(60);
+			fileList._nextPage(true);
+			expect($('#fileList tr').length).toEqual(65);
+			fileList._nextPage(true);
+			// stays at 65
+			expect($('#fileList tr').length).toEqual(65);
+		});
+		it('inserts into the DOM if insertion point is in the visible page ', function() {
+			fileList.add({
+				id: 2000,
+				type: 'file',
+				name: 'File with index 15b.txt'
+			});
+			expect($('#fileList tr').length).toEqual(21);
+			expect(fileList.findFileEl('File with index 15b.txt').index()).toEqual(16);
+		});
+		it('does not inserts into the DOM if insertion point is not the visible page ', function() {
+			fileList.add({
+				id: 2000,
+				type: 'file',
+				name: 'File with index 28b.txt'
+			});
+			expect($('#fileList tr').length).toEqual(20);
+			expect(fileList.findFileEl('File with index 28b.txt').length).toEqual(0);
+			fileList._nextPage(true);
+			expect($('#fileList tr').length).toEqual(40);
+			expect(fileList.findFileEl('File with index 28b.txt').index()).toEqual(29);
+		});
+		it('appends into the DOM when inserting a file after the last visible element', function() {
+			fileList.add({
+				id: 2000,
+				type: 'file',
+				name: 'File with index 19b.txt'
+			});
+			expect($('#fileList tr').length).toEqual(21);
+			fileList._nextPage(true);
+			expect($('#fileList tr').length).toEqual(41);
+		});
+		it('appends into the DOM when inserting a file on the last page when visible', function() {
+			fileList._nextPage(true);
+			expect($('#fileList tr').length).toEqual(40);
+			fileList._nextPage(true);
+			expect($('#fileList tr').length).toEqual(60);
+			fileList._nextPage(true);
+			expect($('#fileList tr').length).toEqual(65);
+			fileList._nextPage(true);
+			fileList.add({
+				id: 2000,
+				type: 'file',
+				name: 'File with index 88.txt'
+			});
+			expect($('#fileList tr').length).toEqual(66);
+			fileList._nextPage(true);
+			expect($('#fileList tr').length).toEqual(66);
+		});
+		it('shows additional page when appending a page of files and scrolling down', function() {
+			var newFiles = generateFiles(66, 81);
+			for (var i = 0; i < newFiles.length; i++) {
+				fileList.add(newFiles[i]);
+			}
+			expect($('#fileList tr').length).toEqual(20);
+			fileList._nextPage(true);
+			expect($('#fileList tr').length).toEqual(40);
+			fileList._nextPage(true);
+			expect($('#fileList tr').length).toEqual(60);
+			fileList._nextPage(true);
+			expect($('#fileList tr').length).toEqual(80);
+			fileList._nextPage(true);
+			expect($('#fileList tr').length).toEqual(81);
+			fileList._nextPage(true);
+			expect($('#fileList tr').length).toEqual(81);
+		});
+		it('automatically renders next page when there are not enough elements visible', function() {
+			// delete the 15 first elements
+			for (var i = 0; i < 15; i++) {
+				fileList.remove(fileList.files[0].name);
+			}
+			// still makes sure that there are 20 elements visible, if any
+			expect($('#fileList tr').length).toEqual(25);
+		});
 	});
 	describe('file previews', function() {
 		var previewLoadStub;
@@ -534,7 +840,7 @@ describe('FileList tests', function() {
 		}
 
 		beforeEach(function() {
-			previewLoadStub = sinon.stub(Files, 'lazyLoadPreview');
+			previewLoadStub = sinon.stub(OCA.Files.FileList.prototype, 'lazyLoadPreview');
 		});
 		afterEach(function() {
 			previewLoadStub.restore();
@@ -544,7 +850,7 @@ describe('FileList tests', function() {
 				type: 'file',
 				name: 'testFile.txt'
 			};
-			var $tr = FileList.add(fileData);
+			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);
@@ -554,7 +860,7 @@ describe('FileList tests', function() {
 				type: 'dir',
 				name: 'test dir'
 			};
-			var $tr = FileList.add(fileData);
+			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);
@@ -565,7 +871,7 @@ describe('FileList tests', function() {
 				name: 'test dir',
 				icon: OC.webroot + '/core/img/filetypes/application-pdf.svg'
 			};
-			var $tr = FileList.add(fileData);
+			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);
@@ -576,12 +882,12 @@ describe('FileList tests', function() {
 				name: 'test dir',
 				isPreviewAvailable: true
 			};
-			var $tr = FileList.add(fileData);
+			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');
+			previewLoadStub.getCall(0).args[0].callback(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() {
@@ -590,7 +896,7 @@ describe('FileList tests', function() {
 				name: 'test dir',
 				isPreviewAvailable: false
 			};
-			var $tr = FileList.add(fileData);
+			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);
@@ -598,26 +904,38 @@ describe('FileList tests', function() {
 	});
 	describe('viewer mode', function() {
 		it('enabling viewer mode hides files table and action buttons', function() {
-			FileList.setViewerMode(true);
+			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);
+			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);
+			fileList.setViewerMode(true);
+			fileList.setViewerMode(false);
 			expect($('#filestable').hasClass('hidden')).toEqual(false);
 			expect($('.actions').hasClass('hidden')).toEqual(true);
 			expect($('.notCreatable').hasClass('hidden')).toEqual(false);
 		});
+		it('toggling viewer mode triggers event', function() {
+			var handler = sinon.stub();
+			fileList.$el.on('changeViewerMode', handler);
+			fileList.setViewerMode(true);
+			expect(handler.calledOnce).toEqual(true);
+			expect(handler.getCall(0).args[0].viewerModeEnabled).toEqual(true);
+
+			handler.reset();
+			fileList.setViewerMode(false);
+			expect(handler.calledOnce).toEqual(true);
+			expect(handler.getCall(0).args[0].viewerModeEnabled).toEqual(false);
+		});
 	});
 	describe('loading file list', function() {
 		beforeEach(function() {
@@ -636,22 +954,22 @@ describe('FileList tests', function() {
 			]);
 		});
 		it('fetches file list from server and renders it when reload() is called', function() {
-			FileList.reload();
+			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'});
+			expect(OC.parseQueryString(query)).toEqual({'dir': '/subdir', sort: 'name', sortdirection: 'asc'});
 			fakeServer.respond();
-			expect($('#fileList tr:not(.summary)').length).toEqual(4);
-			expect(FileList.findFileEl('One.txt').length).toEqual(1);
+			expect($('#fileList tr').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');
+			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'});
+			expect(OC.parseQueryString(query)).toEqual({'dir': '/anothersubdir', sort: 'name', sortdirection: 'asc'});
 			fakeServer.respond();
 		});
 		it('switches to root dir when current directory does not exist', function() {
@@ -661,14 +979,14 @@ describe('FileList tests', function() {
 					},
 					''
 			]);
-			FileList.changeDirectory('/unexist');
+			fileList.changeDirectory('/unexist');
 			fakeServer.respond();
-			expect(FileList.getCurrentDirectory()).toEqual('/');
+			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');
+			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();
@@ -677,18 +995,23 @@ describe('FileList tests', function() {
 			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('triggers "changeDirectory" event when changing directory', function() {
+			var handler = sinon.stub();
+			$('#app-content-files').on('changeDirectory', handler);
+			fileList.changeDirectory('/somedir');
+			expect(handler.calledOnce).toEqual(true);
+			expect(handler.getCall(0).args[0].dir).toEqual('/somedir');
+		});
+		it('changes the directory when receiving "urlChanged" event', function() {
+			$('#app-content-files').trigger(new $.Event('urlChanged', {view: 'files', dir: '/somedir'}));
+			expect(fileList.getCurrentDirectory()).toEqual('/somedir');
 		});
 		it('refreshes breadcrumb after update', function() {
-			var setDirSpy = sinon.spy(FileList.breadcrumb, 'setDirectory');
-			FileList.changeDirectory('/anothersubdir');
+			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);
+			expect(fileList.breadcrumb.setDirectory.calledOnce).toEqual(true);
+			expect(fileList.breadcrumb.setDirectory.calledWith('/anothersubdir')).toEqual(true);
 			setDirSpy.restore();
 		});
 	});
@@ -709,20 +1032,20 @@ describe('FileList tests', function() {
 			]);
 		});
 		it('clicking on root breadcrumb changes directory to root', function() {
-			FileList.changeDirectory('/subdir/two/three with space/four/five');
+			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();
+			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');
+			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();
+			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');
@@ -730,9 +1053,9 @@ describe('FileList tests', function() {
 		});
 		it('dropping files on breadcrumb calls move operation', function() {
 			var request, query, testDir = '/subdir/two/three with space/four/five';
-			FileList.changeDirectory(testDir);
+			fileList.changeDirectory(testDir);
 			fakeServer.respond();
-			var $crumb = FileList.breadcrumb.$el.find('.crumb:eq(3)');
+			var $crumb = fileList.breadcrumb.$el.find('.crumb:eq(3)');
 			// no idea what this is but is required by the handler
 			var ui = {
 				helper: {
@@ -740,14 +1063,12 @@ describe('FileList tests', function() {
 				}
 			};
 			// 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>')
+				$('<tr data-file="One.txt" data-dir="' + testDir + '"></tr>'),
+				$('<tr data-file="Two.jpg" data-dir="' + testDir + '"></tr>')
 			]);
 			// simulate drop event
-			FileList._onDropOnBreadCrumb.call($crumb, new $.Event('drop'), ui);
+			fileList._onDropOnBreadCrumb(new $.Event('drop', {target: $crumb}), ui);
 
 			// will trigger two calls to move.php (first one was previous list.php)
 			expect(fakeServer.requests.length).toEqual(3);
@@ -773,10 +1094,10 @@ describe('FileList tests', function() {
 			});
 		});
 		it('dropping files on same dir breadcrumb does nothing', function() {
-			var request, query, testDir = '/subdir/two/three with space/four/five';
-			FileList.changeDirectory(testDir);
+			var testDir = '/subdir/two/three with space/four/five';
+			fileList.changeDirectory(testDir);
 			fakeServer.respond();
-			var $crumb = FileList.breadcrumb.$el.find('.crumb:last');
+			var $crumb = fileList.breadcrumb.$el.find('.crumb:last');
 			// no idea what this is but is required by the handler
 			var ui = {
 				helper: {
@@ -784,14 +1105,12 @@ describe('FileList tests', function() {
 				}
 			};
 			// 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>')
+				$('<tr data-file="One.txt" data-dir="' + testDir + '"></tr>'),
+				$('<tr data-file="Two.jpg" data-dir="' + testDir + '"></tr>')
 			]);
 			// simulate drop event
-			FileList._onDropOnBreadCrumb.call($crumb, new $.Event('drop'), ui);
+			fileList._onDropOnBreadCrumb(new $.Event('drop', {target: $crumb}), ui);
 
 			// no extra server request
 			expect(fakeServer.requests.length).toEqual(1);
@@ -799,16 +1118,498 @@ describe('FileList tests', function() {
 	});
 	describe('Download Url', function() {
 		it('returns correct download URL for single files', function() {
-			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');
+			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');
 			$('#dir').val('/');
-			expect(Files.getDownloadUrl('some file.txt')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2F&files=some%20file.txt');
+			expect(fileList.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(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');
+			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');
 		});
 		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');
+			expect(fileList.getAjaxUrl('test', {a:1, b:'x y'})).toEqual(OC.webroot + '/index.php/apps/files/ajax/test.php?a=1&b=x%20y');
+		});
+	});
+	describe('File selection', function() {
+		beforeEach(function() {
+			fileList.setFiles(testFiles);
+		});
+		it('Selects a file when clicking its checkbox', function() {
+			var $tr = fileList.findFileEl('One.txt');
+			expect($tr.find('input:checkbox').prop('checked')).toEqual(false);
+			$tr.find('td.filename input:checkbox').click();
+
+			expect($tr.find('input:checkbox').prop('checked')).toEqual(true);
+		});
+		it('Selects/deselect a file when clicking on the name while holding Ctrl', function() {
+			var $tr = fileList.findFileEl('One.txt');
+			var $tr2 = fileList.findFileEl('Three.pdf');
+			var e;
+			expect($tr.find('input:checkbox').prop('checked')).toEqual(false);
+			expect($tr2.find('input:checkbox').prop('checked')).toEqual(false);
+			e = new $.Event('click');
+			e.ctrlKey = true;
+			$tr.find('td.filename .name').trigger(e);
+
+			expect($tr.find('input:checkbox').prop('checked')).toEqual(true);
+			expect($tr2.find('input:checkbox').prop('checked')).toEqual(false);
+
+			// click on second entry, does not clear the selection
+			e = new $.Event('click');
+			e.ctrlKey = true;
+			$tr2.find('td.filename .name').trigger(e);
+			expect($tr.find('input:checkbox').prop('checked')).toEqual(true);
+			expect($tr2.find('input:checkbox').prop('checked')).toEqual(true);
+
+			expect(_.pluck(fileList.getSelectedFiles(), 'name')).toEqual(['One.txt', 'Three.pdf']);
+
+			// deselect now
+			e = new $.Event('click');
+			e.ctrlKey = true;
+			$tr2.find('td.filename .name').trigger(e);
+			expect($tr.find('input:checkbox').prop('checked')).toEqual(true);
+			expect($tr2.find('input:checkbox').prop('checked')).toEqual(false);
+			expect(_.pluck(fileList.getSelectedFiles(), 'name')).toEqual(['One.txt']);
+		});
+		it('Selects a range when clicking on one file then Shift clicking on another one', function() {
+			var $tr = fileList.findFileEl('One.txt');
+			var $tr2 = fileList.findFileEl('Three.pdf');
+			var e;
+			$tr.find('td.filename input:checkbox').click();
+			e = new $.Event('click');
+			e.shiftKey = true;
+			$tr2.find('td.filename .name').trigger(e);
+
+			expect($tr.find('input:checkbox').prop('checked')).toEqual(true);
+			expect($tr2.find('input:checkbox').prop('checked')).toEqual(true);
+			expect(fileList.findFileEl('Two.jpg').find('input:checkbox').prop('checked')).toEqual(true);
+			var selection = _.pluck(fileList.getSelectedFiles(), 'name');
+			expect(selection.length).toEqual(3);
+			expect(selection).toContain('One.txt');
+			expect(selection).toContain('Two.jpg');
+			expect(selection).toContain('Three.pdf');
+		});
+		it('Selects a range when clicking on one file then Shift clicking on another one that is above the first one', function() {
+			var $tr = fileList.findFileEl('One.txt');
+			var $tr2 = fileList.findFileEl('Three.pdf');
+			var e;
+			$tr2.find('td.filename input:checkbox').click();
+			e = new $.Event('click');
+			e.shiftKey = true;
+			$tr.find('td.filename .name').trigger(e);
+
+			expect($tr.find('input:checkbox').prop('checked')).toEqual(true);
+			expect($tr2.find('input:checkbox').prop('checked')).toEqual(true);
+			expect(fileList.findFileEl('Two.jpg').find('input:checkbox').prop('checked')).toEqual(true);
+			var selection = _.pluck(fileList.getSelectedFiles(), 'name');
+			expect(selection.length).toEqual(3);
+			expect(selection).toContain('One.txt');
+			expect(selection).toContain('Two.jpg');
+			expect(selection).toContain('Three.pdf');
+		});
+		it('Selecting all files will automatically check "select all" checkbox', function() {
+			expect($('.select-all').prop('checked')).toEqual(false);
+			$('#fileList tr td.filename input:checkbox').click();
+			expect($('.select-all').prop('checked')).toEqual(true);
+		});
+		it('Selecting all files on the first visible page will not automatically check "select all" checkbox', function() {
+			fileList.setFiles(generateFiles(0, 41));
+			expect($('.select-all').prop('checked')).toEqual(false);
+			$('#fileList tr td.filename input:checkbox').click();
+			expect($('.select-all').prop('checked')).toEqual(false);
+		});
+		it('Clicking "select all" will select/deselect all files', function() {
+			fileList.setFiles(generateFiles(0, 41));
+			$('.select-all').click();
+			expect($('.select-all').prop('checked')).toEqual(true);
+			$('#fileList tr input:checkbox').each(function() {
+				expect($(this).prop('checked')).toEqual(true);
+			});
+			expect(_.pluck(fileList.getSelectedFiles(), 'name').length).toEqual(42);
+
+			$('.select-all').click();
+			expect($('.select-all').prop('checked')).toEqual(false);
+
+			$('#fileList tr input:checkbox').each(function() {
+				expect($(this).prop('checked')).toEqual(false);
+			});
+			expect(_.pluck(fileList.getSelectedFiles(), 'name').length).toEqual(0);
+		});
+		it('Clicking "select all" then deselecting a file will uncheck "select all"', function() {
+			$('.select-all').click();
+			expect($('.select-all').prop('checked')).toEqual(true);
+
+			var $tr = fileList.findFileEl('One.txt');
+			$tr.find('input:checkbox').click();
+
+			expect($('.select-all').prop('checked')).toEqual(false);
+			expect(_.pluck(fileList.getSelectedFiles(), 'name').length).toEqual(3);
+		});
+		it('Updates the selection summary when doing a few manipulations with "Select all"', function() {
+			$('.select-all').click();
+			expect($('.select-all').prop('checked')).toEqual(true);
+
+			var $tr = fileList.findFileEl('One.txt');
+			// unselect one
+			$tr.find('input:checkbox').click();
+
+			expect($('.select-all').prop('checked')).toEqual(false);
+			expect(_.pluck(fileList.getSelectedFiles(), 'name').length).toEqual(3);
+
+			// select all
+			$('.select-all').click();
+			expect($('.select-all').prop('checked')).toEqual(true);
+			expect(_.pluck(fileList.getSelectedFiles(), 'name').length).toEqual(4);
+
+			// unselect one
+			$tr.find('input:checkbox').click();
+			expect($('.select-all').prop('checked')).toEqual(false);
+			expect(_.pluck(fileList.getSelectedFiles(), 'name').length).toEqual(3);
+
+			// re-select it
+			$tr.find('input:checkbox').click();
+			expect($('.select-all').prop('checked')).toEqual(true);
+			expect(_.pluck(fileList.getSelectedFiles(), 'name').length).toEqual(4);
+		});
+		it('Auto-selects files on next page when "select all" is checked', function() {
+			fileList.setFiles(generateFiles(0, 41));
+			$('.select-all').click();
+
+			expect(fileList.$fileList.find('tr input:checkbox:checked').length).toEqual(20);
+			fileList._nextPage(true);
+			expect(fileList.$fileList.find('tr input:checkbox:checked').length).toEqual(40);
+			fileList._nextPage(true);
+			expect(fileList.$fileList.find('tr input:checkbox:checked').length).toEqual(42);
+			expect(_.pluck(fileList.getSelectedFiles(), 'name').length).toEqual(42);
+		});
+		it('Selecting files updates selection summary', function() {
+			var $summary = $('#headerName a.name>span:first');
+			expect($summary.text()).toEqual('Name');
+			fileList.findFileEl('One.txt').find('input:checkbox').click();
+			fileList.findFileEl('Three.pdf').find('input:checkbox').click();
+			fileList.findFileEl('somedir').find('input:checkbox').click();
+			expect($summary.text()).toEqual('1 folder & 2 files');
+		});
+		it('Unselecting files hides selection summary', function() {
+			var $summary = $('#headerName a.name>span:first');
+			fileList.findFileEl('One.txt').find('input:checkbox').click().click();
+			expect($summary.text()).toEqual('Name');
+		});
+		it('Select/deselect files shows/hides file actions', function() {
+			var $actions = $('#headerName .selectedActions');
+			var $checkbox = fileList.findFileEl('One.txt').find('input:checkbox');
+			expect($actions.hasClass('hidden')).toEqual(true);
+			$checkbox.click();
+			expect($actions.hasClass('hidden')).toEqual(false);
+			$checkbox.click();
+			expect($actions.hasClass('hidden')).toEqual(true);
+		});
+		it('Selection is cleared when switching dirs', function() {
+			$('.select-all').click();
+			var data = {
+				status: 'success',
+				data: {
+					files: testFiles,
+					permissions: 31
+				}
+			};
+			fakeServer.respondWith(/\/index\.php\/apps\/files\/ajax\/list.php/, [
+					200, {
+						"Content-Type": "application/json"
+					},
+					JSON.stringify(data)
+			]);
+			fileList.changeDirectory('/');
+			fakeServer.respond();
+			expect($('.select-all').prop('checked')).toEqual(false);
+			expect(_.pluck(fileList.getSelectedFiles(), 'name')).toEqual([]);
+		});
+		it('getSelectedFiles returns the selected files even when they are on the next page', function() {
+			var selectedFiles;
+			fileList.setFiles(generateFiles(0, 41));
+			$('.select-all').click();
+			// unselect one to not have the "allFiles" case
+			fileList.$fileList.find('tr input:checkbox:first').click();
+
+			// only 20 files visible, must still return all the selected ones
+			selectedFiles = _.pluck(fileList.getSelectedFiles(), 'name');
+
+			expect(selectedFiles.length).toEqual(41);
+		});
+		describe('Selection overlay', function() {
+			it('show delete action according to directory permissions', function() {
+				fileList.setFiles(testFiles);
+				$('#permissions').val(OC.PERMISSION_READ | OC.PERMISSION_DELETE);
+				$('.select-all').click();
+				expect(fileList.$el.find('.delete-selected').hasClass('hidden')).toEqual(false);
+				$('.select-all').click();
+				$('#permissions').val(OC.PERMISSION_READ);
+				$('.select-all').click();
+				expect(fileList.$el.find('.delete-selected').hasClass('hidden')).toEqual(true);
+			});
+		});
+		describe('Actions', function() {
+			beforeEach(function() {
+				fileList.findFileEl('One.txt').find('input:checkbox').click();
+				fileList.findFileEl('Three.pdf').find('input:checkbox').click();
+				fileList.findFileEl('somedir').find('input:checkbox').click();
+			});
+			it('getSelectedFiles returns the selected file data', function() {
+				var files = fileList.getSelectedFiles();
+				expect(files.length).toEqual(3);
+				expect(files[0]).toEqual({
+					id: 1,
+					name: 'One.txt',
+					mimetype: 'text/plain',
+					type: 'file',
+					size: 12,
+					etag: 'abc'
+				});
+				expect(files[1]).toEqual({
+					id: 3,
+					type: 'file',
+					name: 'Three.pdf',
+					mimetype: 'application/pdf',
+					size: 58009,
+					etag: '123'
+				});
+				expect(files[2]).toEqual({
+					id: 4,
+					type: 'dir',
+					name: 'somedir',
+					mimetype: 'httpd/unix-directory',
+					size: 250,
+					etag: '456'
+				});
+			});
+			it('Removing a file removes it from the selection', function() {
+				fileList.remove('Three.pdf');
+				var files = fileList.getSelectedFiles();
+				expect(files.length).toEqual(2);
+				expect(files[0]).toEqual({
+					id: 1,
+					name: 'One.txt',
+					mimetype: 'text/plain',
+					type: 'file',
+					size: 12,
+					etag: 'abc'
+				});
+				expect(files[1]).toEqual({
+					id: 4,
+					type: 'dir',
+					name: 'somedir',
+					mimetype: 'httpd/unix-directory',
+					size: 250,
+					etag: '456'
+				});
+			});
+			describe('Download', function() {
+				it('Opens download URL when clicking "Download"', function() {
+					var redirectStub = sinon.stub(OC, 'redirect');
+					$('.selectedActions .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=%5B%22One.txt%22%2C%22Three.pdf%22%2C%22somedir%22%5D');
+					redirectStub.restore();
+				});
+				it('Downloads root folder when all selected in root folder', function() {
+					$('#dir').val('/');
+					$('.select-all').click();
+					var redirectStub = sinon.stub(OC, 'redirect');
+					$('.selectedActions .download').click();
+					expect(redirectStub.calledOnce).toEqual(true);
+					expect(redirectStub.getCall(0).args[0]).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2F&files=');
+					redirectStub.restore();
+				});
+				it('Downloads parent folder when all selected in subfolder', function() {
+					$('.select-all').click();
+					var redirectStub = sinon.stub(OC, 'redirect');
+					$('.selectedActions .download').click();
+					expect(redirectStub.calledOnce).toEqual(true);
+					expect(redirectStub.getCall(0).args[0]).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2F&files=subdir');
+					redirectStub.restore();
+				});
+			});
+			describe('Delete', function() {
+				it('Deletes selected files when "Delete" clicked', function() {
+					var request;
+					$('.selectedActions .delete-selected').click();
+					expect(fakeServer.requests.length).toEqual(1);
+					request = fakeServer.requests[0];
+					expect(request.url).toEqual(OC.webroot + '/index.php/apps/files/ajax/delete.php');
+					expect(OC.parseQueryString(request.requestBody))
+						.toEqual({'dir': '/subdir', files: '["One.txt","Three.pdf","somedir"]'});
+					fakeServer.requests[0].respond(
+						200,
+						{ 'Content-Type': 'application/json' },
+						JSON.stringify({status: 'success'})
+					);
+					expect(fileList.findFileEl('One.txt').length).toEqual(0);
+					expect(fileList.findFileEl('Three.pdf').length).toEqual(0);
+					expect(fileList.findFileEl('somedir').length).toEqual(0);
+					expect(fileList.findFileEl('Two.jpg').length).toEqual(1);
+				});
+				it('Deletes all files when all selected when "Delete" clicked', function() {
+					var request;
+					$('.select-all').click();
+					$('.selectedActions .delete-selected').click();
+					expect(fakeServer.requests.length).toEqual(1);
+					request = fakeServer.requests[0];
+					expect(request.url).toEqual(OC.webroot + '/index.php/apps/files/ajax/delete.php');
+					expect(OC.parseQueryString(request.requestBody))
+						.toEqual({'dir': '/subdir', allfiles: 'true'});
+					fakeServer.requests[0].respond(
+						200,
+						{ 'Content-Type': 'application/json' },
+						JSON.stringify({status: 'success'})
+					);
+					expect(fileList.isEmpty).toEqual(true);
+				});
+			});
+		});
+		it('resets the file selection on reload', function() {
+			fileList.$el.find('.select-all').click();
+			fileList.reload();
+			expect(fileList.$el.find('.select-all').prop('checked')).toEqual(false);
+			expect(fileList.getSelectedFiles()).toEqual([]);
+		});
+	});
+	describe('Sorting files', function() {
+		it('Sorts by name by default', function() {
+			fileList.reload();
+			expect(fakeServer.requests.length).toEqual(1);
+			var url = fakeServer.requests[0].url;
+			var query = OC.parseQueryString(url.substr(url.indexOf('?') + 1));
+			expect(query.sort).toEqual('name');
+			expect(query.sortdirection).toEqual('asc');
+		});
+		it('Reloads file list with a different sort when clicking on column header of unsorted column', function() {
+			fileList.$el.find('.column-size .columntitle').click();
+			expect(fakeServer.requests.length).toEqual(1);
+			var url = fakeServer.requests[0].url;
+			var query = OC.parseQueryString(url.substr(url.indexOf('?') + 1));
+			expect(query.sort).toEqual('size');
+			expect(query.sortdirection).toEqual('asc');
+		});
+		it('Toggles sort direction when clicking on already sorted column', function() {
+			fileList.$el.find('.column-name .columntitle').click();
+			expect(fakeServer.requests.length).toEqual(1);
+			var url = fakeServer.requests[0].url;
+			var query = OC.parseQueryString(url.substr(url.indexOf('?') + 1));
+			expect(query.sort).toEqual('name');
+			expect(query.sortdirection).toEqual('desc');
+		});
+		it('Toggles the sort indicator when clicking on a column header', function() {
+			var ASC_CLASS = fileList.SORT_INDICATOR_ASC_CLASS;
+			var DESC_CLASS = fileList.SORT_INDICATOR_DESC_CLASS;
+			fileList.$el.find('.column-size .columntitle').click();
+			// moves triangle to size column
+			expect(
+				fileList.$el.find('.column-name .sort-indicator').hasClass(ASC_CLASS + ' ' + DESC_CLASS)
+			).toEqual(false);
+			expect(
+				fileList.$el.find('.column-size .sort-indicator').hasClass(ASC_CLASS)
+			).toEqual(true);
+
+			// click again on size column, reverses direction
+			fileList.$el.find('.column-size .columntitle').click();
+			expect(
+				fileList.$el.find('.column-size .sort-indicator').hasClass(DESC_CLASS)
+			).toEqual(true);
+
+			// click again on size column, reverses direction
+			fileList.$el.find('.column-size .columntitle').click();
+			expect(
+				fileList.$el.find('.column-size .sort-indicator').hasClass(ASC_CLASS)
+			).toEqual(true);
+
+			// click on mtime column, moves indicator there
+			fileList.$el.find('.column-mtime .columntitle').click();
+			expect(
+				fileList.$el.find('.column-size .sort-indicator').hasClass(ASC_CLASS + ' ' + DESC_CLASS)
+			).toEqual(false);
+			expect(
+				fileList.$el.find('.column-mtime .sort-indicator').hasClass(ASC_CLASS)
+			).toEqual(true);
+		});
+		it('Uses correct sort comparator when inserting files', function() {
+			testFiles.sort(OCA.Files.FileList.Comparators.size);
+			// this will make it reload the testFiles with the correct sorting
+			fileList.$el.find('.column-size .columntitle').click();
+			expect(fakeServer.requests.length).toEqual(1);
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({
+					status: 'success',
+					data: {
+						files: testFiles,
+						permissions: 31
+					}
+				})
+			);
+			var newFileData = {
+				id: 999,
+				type: 'file',
+				name: 'new file.txt',
+				mimetype: 'text/plain',
+				size: 40001,
+				etag: '999'
+			};
+			fileList.add(newFileData);
+			expect(fileList.files.length).toEqual(5);
+			expect(fileList.$fileList.find('tr').length).toEqual(5);
+			expect(fileList.findFileEl('One.txt').index()).toEqual(0);
+			expect(fileList.findFileEl('somedir').index()).toEqual(1);
+			expect(fileList.findFileEl('Two.jpg').index()).toEqual(2);
+			expect(fileList.findFileEl('new file.txt').index()).toEqual(3);
+			expect(fileList.findFileEl('Three.pdf').index()).toEqual(4);
+		});
+		it('Uses correct reversed sort comparator when inserting files', function() {
+			testFiles.sort(OCA.Files.FileList.Comparators.size);
+			testFiles.reverse();
+			// this will make it reload the testFiles with the correct sorting
+			fileList.$el.find('.column-size .columntitle').click();
+			expect(fakeServer.requests.length).toEqual(1);
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({
+					status: 'success',
+					data: {
+						files: testFiles,
+						permissions: 31
+					}
+				})
+			);
+			// reverse sort
+			fileList.$el.find('.column-size .columntitle').click();
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({
+					status: 'success',
+					data: {
+						files: testFiles,
+						permissions: 31
+					}
+				})
+			);
+			var newFileData = {
+				id: 999,
+				type: 'file',
+				name: 'new file.txt',
+				mimetype: 'text/plain',
+				size: 40001,
+				etag: '999'
+			};
+			fileList.add(newFileData);
+			expect(fileList.files.length).toEqual(5);
+			expect(fileList.$fileList.find('tr').length).toEqual(5);
+			expect(fileList.findFileEl('One.txt').index()).toEqual(4);
+			expect(fileList.findFileEl('somedir').index()).toEqual(3);
+			expect(fileList.findFileEl('Two.jpg').index()).toEqual(2);
+			expect(fileList.findFileEl('new file.txt').index()).toEqual(1);
+			expect(fileList.findFileEl('Three.pdf').index()).toEqual(0);
 		});
 	});
 });
diff --git a/apps/files/tests/js/filesSpec.js b/apps/files/tests/js/filesSpec.js
index 018c8ef0f3..4f8d5a2931 100644
--- a/apps/files/tests/js/filesSpec.js
+++ b/apps/files/tests/js/filesSpec.js
@@ -19,8 +19,9 @@
 *
 */
 
-/* global Files */
-describe('Files tests', function() {
+describe('OCA.Files.Files tests', function() {
+	var Files = OCA.Files.Files;
+
 	describe('File name validation', function() {
 		it('Validates correct file names', function() {
 			var fileNames = [
@@ -82,4 +83,18 @@ describe('Files tests', function() {
 			}
 		});
 	});
+	describe('getDownloadUrl', function() {
+		it('returns the ajax download URL when filename and dir specified', function() {
+			var url = Files.getDownloadUrl('test file.txt', '/subdir');
+			expect(url).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=test%20file.txt');
+		});
+		it('returns the ajax download URL when filename and root dir specific', function() {
+			var url = Files.getDownloadUrl('test file.txt', '/');
+			expect(url).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2F&files=test%20file.txt');
+		});
+		it('returns the ajax download URL when multiple files specified', function() {
+			var url = Files.getDownloadUrl(['test file.txt', 'abc.txt'], '/subdir');
+			expect(url).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=%5B%22test%20file.txt%22%2C%22abc.txt%22%5D');
+		});
+	});
 });
diff --git a/apps/files/tests/js/filesummarySpec.js b/apps/files/tests/js/filesummarySpec.js
new file mode 100644
index 0000000000..5e39dd1d23
--- /dev/null
+++ b/apps/files/tests/js/filesummarySpec.js
@@ -0,0 +1,88 @@
+/**
+* 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 FileSummary */
+describe('OCA.Files.FileSummary tests', function() {
+	var FileSummary = OCA.Files.FileSummary;
+	var $container;
+
+	beforeEach(function() {
+		$container = $('<table><tr></tr></table>').find('tr');
+	});
+	afterEach(function() {
+		$container = null;
+	});
+
+	it('renders summary as text', function() {
+		var s = new FileSummary($container);
+		s.setSummary({
+			totalDirs: 5,
+			totalFiles: 2,
+			totalSize: 256000
+		});
+		expect($container.hasClass('hidden')).toEqual(false);
+		expect($container.find('.info').text()).toEqual('5 folders and 2 files');
+		expect($container.find('.filesize').text()).toEqual('250 kB');
+	});
+	it('hides summary when no files or folders', function() {
+		var s = new FileSummary($container);
+		s.setSummary({
+			totalDirs: 0,
+			totalFiles: 0,
+			totalSize: 0
+		});
+		expect($container.hasClass('hidden')).toEqual(true);
+	});
+	it('increases summary when adding files', function() {
+		var s = new FileSummary($container);
+		s.setSummary({
+			totalDirs: 5,
+			totalFiles: 2,
+			totalSize: 256000
+		});
+		s.add({type: 'file', size: 256000});
+		s.add({type: 'dir', size: 100});
+		s.update();
+		expect($container.hasClass('hidden')).toEqual(false);
+		expect($container.find('.info').text()).toEqual('6 folders and 3 files');
+		expect($container.find('.filesize').text()).toEqual('500 kB');
+		expect(s.summary.totalDirs).toEqual(6);
+		expect(s.summary.totalFiles).toEqual(3);
+		expect(s.summary.totalSize).toEqual(512100);
+	});
+	it('decreases summary when removing files', function() {
+		var s = new FileSummary($container);
+		s.setSummary({
+			totalDirs: 5,
+			totalFiles: 2,
+			totalSize: 256000
+		});
+		s.remove({type: 'file', size: 128000});
+		s.remove({type: 'dir', size: 100});
+		s.update();
+		expect($container.hasClass('hidden')).toEqual(false);
+		expect($container.find('.info').text()).toEqual('4 folders and 1 file');
+		expect($container.find('.filesize').text()).toEqual('125 kB');
+		expect(s.summary.totalDirs).toEqual(4);
+		expect(s.summary.totalFiles).toEqual(1);
+		expect(s.summary.totalSize).toEqual(127900);
+	});
+});
diff --git a/apps/files/triggerupdate.php b/apps/files/triggerupdate.php
index a37b9823ad..3f85da9913 100644
--- a/apps/files/triggerupdate.php
+++ b/apps/files/triggerupdate.php
@@ -6,7 +6,7 @@ if (OC::$CLI) {
 	if (count($argv) === 2) {
 		$file = $argv[1];
 		list(, $user) = explode('/', $file);
-		OCP\JSON::checkUserExists($owner);
+		OCP\JSON::checkUserExists($user);
 		OC_Util::setupFS($user);
 		$view = new \OC\Files\View('');
 		/**
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
index 61e43acc2c..303ba0e16e 100644
--- a/apps/files_encryption/ajax/adminrecovery.php
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -5,7 +5,7 @@
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  *
- * @brief Script to handle admin settings for encrypted key recovery
+ * Script to handle admin settings for encrypted key recovery
  */
 use OCA\Encryption;
 
diff --git a/apps/files_encryption/ajax/changeRecoveryPassword.php b/apps/files_encryption/ajax/changeRecoveryPassword.php
index 945f054ea8..0cb010d3b5 100644
--- a/apps/files_encryption/ajax/changeRecoveryPassword.php
+++ b/apps/files_encryption/ajax/changeRecoveryPassword.php
@@ -5,7 +5,7 @@
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  *
- * @brief Script to change recovery key password
+ * Script to change recovery key password
  *
  */
 
@@ -23,7 +23,7 @@ $oldPassword = $_POST['oldPassword'];
 $newPassword = $_POST['newPassword'];
 
 $view = new \OC\Files\View('/');
-$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), \OCP\User::getUser());
 
 $proxyStatus = \OC_FileProxy::$enabled;
 \OC_FileProxy::$enabled = false;
diff --git a/apps/files_encryption/ajax/getMigrationStatus.php b/apps/files_encryption/ajax/getMigrationStatus.php
index 7c9e0dcc51..adceb94904 100644
--- a/apps/files_encryption/ajax/getMigrationStatus.php
+++ b/apps/files_encryption/ajax/getMigrationStatus.php
@@ -4,7 +4,7 @@
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  *
- * @brief check migration status
+ * check migration status
  */
 use OCA\Encryption\Util;
 
@@ -18,7 +18,7 @@ $migrationStatus = Util::MIGRATION_COMPLETED;
 if ($loginname !== '' && $password !== '') {
 	$username = \OCP\User::checkPassword($loginname, $password);
 	if ($username) {
-		$util = new Util(new \OC_FilesystemView('/'), $username);
+		$util = new Util(new \OC\Files\View('/'), $username);
 		$migrationStatus = $util->getMigrationStatus();
 	}
 }
diff --git a/apps/files_encryption/ajax/updatePrivateKeyPassword.php b/apps/files_encryption/ajax/updatePrivateKeyPassword.php
index 29c72952ae..f7d20c486c 100644
--- a/apps/files_encryption/ajax/updatePrivateKeyPassword.php
+++ b/apps/files_encryption/ajax/updatePrivateKeyPassword.php
@@ -5,7 +5,7 @@
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  *
- * @brief Script to change recovery key password
+ * Script to change recovery key password
  *
  */
 
diff --git a/apps/files_encryption/ajax/userrecovery.php b/apps/files_encryption/ajax/userrecovery.php
index d6c94bde81..0f3b973d69 100644
--- a/apps/files_encryption/ajax/userrecovery.php
+++ b/apps/files_encryption/ajax/userrecovery.php
@@ -4,7 +4,7 @@
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  *
- * @brief Script to handle admin settings for encrypted key recovery
+ * Script to handle admin settings for encrypted key recovery
  */
 
 use OCA\Encryption;
@@ -19,7 +19,7 @@ if (
 ) {
 
 	$userId = \OCP\USER::getUser();
-	$view = new \OC_FilesystemView('/');
+	$view = new \OC\Files\View('/');
 	$util = new \OCA\Encryption\Util($view, $userId);
 
 	// Save recovery preference to DB
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 21de421c19..104e8568ca 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -40,7 +40,7 @@ if (!OC_Config::getValue('maintenance', false)) {
 			\OC_Util::setupFS();
 		}
 
-		$view = new OC_FilesystemView('/');
+		$view = new OC\Files\View('/');
 
 		$sessionReady = OCA\Encryption\Helper::checkRequirements();
 		if($sessionReady) {
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 5f0494e62c..c1ccb927df 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -36,7 +36,7 @@ class Hooks {
 	private static $deleteFiles = array();
 
 	/**
-	 * @brief Startup encryption backend upon user login
+	 * Startup encryption backend upon user login
 	 * @note This method should never be called for users using client side encryption
 	 */
 	public static function login($params) {
@@ -48,7 +48,7 @@ class Hooks {
 
 		$l = new \OC_L10N('files_encryption');
 
-		$view = new \OC_FilesystemView('/');
+		$view = new \OC\Files\View('/');
 
 		// ensure filesystem is loaded
 		if(!\OC\Files\Filesystem::$loaded) {
@@ -93,7 +93,7 @@ class Hooks {
 		// If migration not yet done
 		if ($ready) {
 
-			$userView = new \OC_FilesystemView('/' . $params['uid']);
+			$userView = new \OC\Files\View('/' . $params['uid']);
 
 			// Set legacy encryption key if it exists, to support
 			// depreciated encryption system
@@ -136,26 +136,26 @@ class Hooks {
 	}
 
 	/**
-	 * @brief setup encryption backend upon user created
+	 * setup encryption backend upon user created
 	 * @note This method should never be called for users using client side encryption
 	 */
 	public static function postCreateUser($params) {
 
 		if (\OCP\App::isEnabled('files_encryption')) {
-			$view = new \OC_FilesystemView('/');
+			$view = new \OC\Files\View('/');
 			$util = new Util($view, $params['uid']);
 			Helper::setupUser($util, $params['password']);
 		}
 	}
 
 	/**
-	 * @brief cleanup encryption backend upon user deleted
+	 * cleanup encryption backend upon user deleted
 	 * @note This method should never be called for users using client side encryption
 	 */
 	public static function postDeleteUser($params) {
 
 		if (\OCP\App::isEnabled('files_encryption')) {
-			$view = new \OC_FilesystemView('/');
+			$view = new \OC\Files\View('/');
 
 			// cleanup public key
 			$publicKey = '/public-keys/' . $params['uid'] . '.public.key';
@@ -171,7 +171,7 @@ class Hooks {
 	}
 
 	/**
-	 * @brief If the password can't be changed within ownCloud, than update the key password in advance.
+	 * If the password can't be changed within ownCloud, than update the key password in advance.
 	 */
 	public static function preSetPassphrase($params) {
 		if (\OCP\App::isEnabled('files_encryption')) {
@@ -182,7 +182,7 @@ class Hooks {
 	}
 
 	/**
-	 * @brief Change a user's encryption passphrase
+	 * Change a user's encryption passphrase
 	 * @param array $params keys: uid, password
 	 */
 	public static function setPassphrase($params) {
@@ -196,7 +196,7 @@ class Hooks {
 		// the necessary keys)
 		if (Crypt::mode() === 'server') {
 
-			$view = new \OC_FilesystemView('/');
+			$view = new \OC\Files\View('/');
 
 			if ($params['uid'] === \OCP\User::getUser()) {
 
@@ -259,10 +259,10 @@ class Hooks {
 	}
 
 	/*
-	 * @brief check if files can be encrypted to every user.
+	 * check if files can be encrypted to every user.
 	 */
 	/**
-	 * @param $params
+	 * @param array $params
 	 */
 	public static function preShared($params) {
 
@@ -308,7 +308,7 @@ class Hooks {
 
 		if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
 
-			$view = new \OC_FilesystemView('/');
+			$view = new \OC\Files\View('/');
 			$session = new \OCA\Encryption\Session($view);
 			$userId = \OCP\User::getUser();
 			$util = new Util($view, $userId);
@@ -350,7 +350,7 @@ class Hooks {
 
 		if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
 
-			$view = new \OC_FilesystemView('/');
+			$view = new \OC\Files\View('/');
 			$userId = \OCP\User::getUser();
 			$util = new Util($view, $userId);
 			$path = \OC\Files\Filesystem::getPath($params['fileSource']);
@@ -398,12 +398,12 @@ class Hooks {
 	}
 
 	/**
-	 * @brief mark file as renamed so that we know the original source after the file was renamed
+	 * mark file as renamed so that we know the original source after the file was renamed
 	 * @param array $params with the old path and the new path
 	 */
 	public static function preRename($params) {
 		$user = \OCP\User::getUser();
-		$view = new \OC_FilesystemView('/');
+		$view = new \OC\Files\View('/');
 		$util = new Util($view, $user);
 		list($ownerOld, $pathOld) = $util->getUidAndFilename($params['oldpath']);
 
@@ -421,8 +421,8 @@ class Hooks {
 	}
 
 	/**
-	 * @brief after a file is renamed, rename its keyfile and share-keys also fix the file size and fix also the sharing
-	 * @param array with oldpath and newpath
+	 * after a file is renamed, rename its keyfile and share-keys also fix the file size and fix also the sharing
+	 * @param array $params array with oldpath and newpath
 	 *
 	 * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
 	 * of the stored versions along the actual file
@@ -437,7 +437,7 @@ class Hooks {
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		$view = new \OC_FilesystemView('/');
+		$view = new \OC\Files\View('/');
 		$session = new \OCA\Encryption\Session($view);
 		$userId = \OCP\User::getUser();
 		$util = new Util($view, $userId);
@@ -557,7 +557,7 @@ class Hooks {
 	}
 
 	/**
-	 * @brief if the file was really deleted we remove the encryption keys
+	 * if the file was really deleted we remove the encryption keys
 	 * @param array $params
 	 * @return boolean|null
 	 */
@@ -597,7 +597,7 @@ class Hooks {
 	}
 
 	/**
-	 * @brief remember the file which should be deleted and it's owner
+	 * remember the file which should be deleted and it's owner
 	 * @param array $params
 	 * @return boolean|null
 	 */
@@ -610,7 +610,7 @@ class Hooks {
 			return true;
 		}
 
-		$util = new Util(new \OC_FilesystemView('/'), \OCP\USER::getUser());
+		$util = new Util(new \OC\Files\View('/'), \OCP\USER::getUser());
 		list($owner, $ownerPath) = $util->getUidAndFilename($path);
 
 		self::$deleteFiles[$params[\OC\Files\Filesystem::signal_param_path]] = array(
diff --git a/apps/files_encryption/l10n/ast.php b/apps/files_encryption/l10n/ast.php
index 7e08e07309..8b51ec775d 100644
--- a/apps/files_encryption/l10n/ast.php
+++ b/apps/files_encryption/l10n/ast.php
@@ -1,13 +1,44 @@
 <?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",
+"Recovery key successfully enabled" => "Habilitóse la recuperación de ficheros",
+"Could not enable recovery key. Please check your recovery key password!" => "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña.",
+"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
+"Could not disable recovery key. Please check your recovery key password!" => "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
+"Password successfully changed." => "Camudóse la contraseña",
+"Could not change the password. Maybe the old password was not correct." => "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
+"Private key password successfully updated." => "Contraseña de clave privada anovada correchamente.",
+"Could not update the private key password. Maybe the old password was not correct." => "Nun pudo camudase la contraseña. Pue que la contraseña antigua nun seya correuta.",
+"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." => "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu.",
+"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." => "¡La clave privada nun ye válida! Seique la contraseña se camudase dende fuera de %s (Ex:El to direutoriu corporativu). Pues anovar la contraseña de la clave privada nes tos opciones personales pa recuperar l'accesu a los ficheros.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartíu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.",
+"Unknown error please check your system settings or contact your administrator" => "Fallu desconocíu. Verifica la configuración del sistema o ponte en contautu col alministrador",
+"Missing requirements." => "Requisitos incompletos.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrate de que PHP 5.3.3 o postreru ta instaláu y que la estensión OpenSSL de PHP ta habilitada y configurada correutamente. Pel momentu, l'aplicación de cifráu deshabilitóse.",
+"Following users are not set up for encryption:" => "Los siguientes usuarios nun se configuraron pal cifráu:",
+"Initial encryption started... This can take some time. Please wait." => "Cifráu aniciáu..... Esto pue llevar un tiempu. Por favor espera.",
+"Initial encryption running... Please try again later." => "Cifráu inicial en cursu... Inténtalo dempués.",
+"Go directly to your " => "Dir direutamente a",
+"personal settings" => "opciones personales",
 "Encryption" => "Cifráu",
-"Enabled" => "Habilitáu",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los ficheros del usuariu en casu de perda de la contraseña);",
+"Recovery key password" => "Contraseña de clave de recuperación",
+"Repeat Recovery key password" => "Repeti la contraseña de clave de recuperación",
+"Enabled" => "Habilitar",
 "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"
+"Change recovery key password:" => "Camudar la contraseña de la clave de recuperación",
+"Old Recovery key password" => "Clave de recuperación vieya",
+"New Recovery key password" => "Clave de recuperación nueva",
+"Repeat New Recovery key password" => "Repetir la clave de recuperación nueva",
+"Change Password" => "Camudar contraseña",
+"Your private key password no longer match your log-in password:" => "La to contraseña de clave privada yá nun concasa cola contraseña d'accesu:",
+"Set your old private key password to your current log-in password." => "Afitar la contraseña de la to clave privada vieya a la to contraseña actual d'accesu.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.",
+"Old log-in password" => "Contraseña d'accesu vieya",
+"Current log-in password" => "Contraseña d'accesu actual",
+"Update Private Key Password" => "Anovar Contraseña de Clave Privada",
+"Enable password recovery:" => "Habilitar la recuperación de contraseña:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña",
+"File recovery settings updated" => "Opciones de recuperación de ficheros anovada",
+"Could not update file recovery" => "Nun pudo anovase la recuperación de ficheros"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
index 3f8d631e10..420fd7423f 100644
--- a/apps/files_encryption/l10n/fa.php
+++ b/apps/files_encryption/l10n/fa.php
@@ -9,6 +9,7 @@ $TRANSLATIONS = array(
 "Private key password successfully updated." => "رمزعبور کلید خصوصی با موفقیت به روز شد.",
 "Could not update the private key password. Maybe the old password was not correct." => "رمزعبور کلید خصوصی را نمی تواند به روز کند. شاید رمزعبور قدیمی صحیح نمی باشد.",
 "Missing requirements." => "نیازمندی های گمشده",
+"Following users are not set up for encryption:" => "کاربران زیر برای رمزنگاری تنظیم نشده اند",
 "personal settings" => "تنظیمات شخصی",
 "Encryption" => "رمزگذاری",
 "Enable recovery key (allow to recover users files in case of password loss):" => "فعال کردن کلید بازیابی(اجازه بازیابی فایل های کاربران در صورت از دست دادن رمزعبور):",
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index 9a1963953e..409f1917a4 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -10,17 +10,21 @@ $TRANSLATIONS = array(
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Não foi possível desencriptar este ficheiro, possivelmente é um ficheiro partilhado. Peça ao proprietário do ficheiro para voltar a partilhar o ficheiro consigo.",
 "Unknown error please check your system settings or contact your administrator" => "Erro desconhecido. Verifique por favor as definições do sistema ou contacte o seu administrador",
 "Missing requirements." => "Faltam alguns requisitos.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que PHP 5.3.3 ou mais recente está instalado e que  OpenSSL juntamente com a extensão  PHP está ativada e corretamente configurada. Por agora, a aplicação de  encriptação está desactivada.",
 "Following users are not set up for encryption:" => "Os utilizadores seguintes não estão marcados para cifragem:",
+"Initial encryption started... This can take some time. Please wait." => "A encriptação inicial começou... Pode demorar algum tempo. Aguarde, por favor.",
 "Go directly to your " => "Ir directamente para o seu",
 "personal settings" => "configurações personalizadas ",
 "Encryption" => "Encriptação",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Active a chave de recuperação (permite recuperar os ficheiros no caso de perda da password):",
 "Recovery key password" => "Chave de recuperação da conta",
+"Repeat Recovery key password" => "Repetir a chave de recuperação da conta",
 "Enabled" => "Activado",
 "Disabled" => "Desactivado",
 "Change recovery key password:" => "Alterar a chave de recuperação:",
 "Old Recovery key password" => "Chave anterior de recuperação da conta",
 "New Recovery key password" => "Nova chave de recuperação da conta",
+"Repeat New Recovery key password" => "Repetir a nova chave de recuperação da conta",
 "Change Password" => "Mudar a Password",
 "Old log-in password" => "Password anterior da conta",
 "Current log-in password" => "Password actual da conta",
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 85e35f5ddd..ba87330c48 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -9,7 +9,7 @@ $TRANSLATIONS = array(
 "Private key password successfully updated." => "Gizli anahtar parolası başarıyla güncellendi",
 "Could not update the private key password. Maybe the old password was not correct." => "Gizli anahtar parolası güncellenemedi. Eski parola hatalı olabilir.",
 "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." => "Şifreleme uygulaması başlatılamadı! Oturumunuz sırasında şifreleme uygulaması tekrar etkinleştirilmiş olabilir. Lütfen şifreleme uygulamasını başlatmak için oturumu kapatıp yeniden oturum açmayı deneyin.",
-"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." => "Gizli anahtarınız geçerli değil! Muhtemelen parolanız ownCloud sistemi %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz.",
+"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." => "Gizli anahtarınız geçerli değil! Muhtemelen parolanız %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifresi çözülemiyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
 "Unknown error please check your system settings or contact your administrator" => "Bilinmeyen hata. Lütfen sistem ayarlarınızı denetleyin veya yöneticiniz ile iletişime geçin",
 "Missing requirements." => "Gereklilikler eksik.",
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index a4f7bd3549..ec7b3bc92e 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -40,7 +40,7 @@ class Crypt {
 
 
 	/**
-	 * @brief return encryption mode client or server side encryption
+	 * return encryption mode client or server side encryption
 	 * @param string $user name (use system wide setting if name=null)
 	 * @return string 'client' or 'server'
 	 */
@@ -51,7 +51,7 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Create a new encryption keypair
+	 * Create a new encryption keypair
 	 * @return array publicKey, privatekey
 	 */
 	public static function createKeypair() {
@@ -85,7 +85,7 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Add arbitrary padding to encrypted data
+	 * Add arbitrary padding to encrypted data
 	 * @param string $data data to be padded
 	 * @return string padded data
 	 * @note In order to end up with data exactly 8192 bytes long we must
@@ -102,7 +102,7 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Remove arbitrary padding to encrypted data
+	 * Remove arbitrary padding to encrypted data
 	 * @param string $padded padded data to remove padding from
 	 * @return string unpadded data on success, false on error
 	 */
@@ -124,8 +124,8 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Check if a file's contents contains an IV and is symmetrically encrypted
-	 * @param $content
+	 * Check if a file's contents contains an IV and is symmetrically encrypted
+	 * @param string $content
 	 * @return boolean
 	 * @note see also OCA\Encryption\Util->isEncryptedPath()
 	 */
@@ -178,11 +178,10 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Check if a file is encrypted via legacy system
-	 * @param $data
+	 * Check if a file is encrypted via legacy system
+	 * @param boolean $isCatFileContent
 	 * @param string $relPath The path of the file, relative to user/data;
 	 *        e.g. filename or /Docs/filename, NOT admin/files/filename
-	 * @param boolean $isCatFileContent
 	 * @return boolean
 	 */
 	public static function isLegacyEncryptedContent($isCatFileContent, $relPath) {
@@ -209,7 +208,7 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Symmetrically encrypt a string
+	 * Symmetrically encrypt a string
 	 * @param string $plainContent
 	 * @param string $iv
 	 * @param string $passphrase
@@ -229,7 +228,7 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Symmetrically decrypt a string
+	 * Symmetrically decrypt a string
 	 * @param string $encryptedContent
 	 * @param string $iv
 	 * @param string $passphrase
@@ -251,10 +250,10 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Concatenate encrypted data with its IV and padding
+	 * Concatenate encrypted data with its IV and padding
 	 * @param string $content content to be concatenated
 	 * @param string $iv IV to be concatenated
-	 * @returns string concatenated content
+	 * @return string concatenated content
 	 */
 	private static function concatIv($content, $iv) {
 
@@ -265,9 +264,9 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Split concatenated data and IV into respective parts
+	 * Split concatenated data and IV into respective parts
 	 * @param string $catFile concatenated data to be split
-	 * @returns array keys: encrypted, iv
+	 * @return array keys: encrypted, iv
 	 */
 	private static function splitIv($catFile) {
 
@@ -290,7 +289,7 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Symmetrically encrypts a string and returns keyfile content
+	 * Symmetrically encrypts a string and returns keyfile content
 	 * @param string $plainContent content to be encrypted in keyfile
 	 * @param string $passphrase
 	 * @return false|string encrypted content combined with IV
@@ -322,15 +321,15 @@ class Crypt {
 
 
 	/**
-	 * @brief Symmetrically decrypts keyfile content
-	 * @param $keyfileContent
+	 * Symmetrically decrypts keyfile content
+	 * @param string $keyfileContent
 	 * @param string $passphrase
 	 * @throws \Exception
 	 * @return string|false
 	 * @internal param string $source
 	 * @internal param string $target
 	 * @internal param string $key the decryption key
-	 * @returns string decrypted content
+	 * @return string decrypted content
 	 *
 	 * This function decrypts a file
 	 */
@@ -359,10 +358,10 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Decrypt private key and check if the result is a valid keyfile
+	 * Decrypt private key and check if the result is a valid keyfile
 	 * @param string $encryptedKey encrypted keyfile
 	 * @param string $passphrase to decrypt keyfile
-	 * @returns encrypted private key or false
+	 * @return string|false encrypted private key or false
 	 *
 	 * This function decrypts a file
 	 */
@@ -386,10 +385,10 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Create asymmetrically encrypted keyfile content using a generated key
+	 * Create asymmetrically encrypted keyfile content using a generated key
 	 * @param string $plainContent content to be encrypted
 	 * @param array $publicKeys array keys must be the userId of corresponding user
-	 * @returns array keys: keys (array, key = userId), data
+	 * @return array keys: keys (array, key = userId), data
 	 * @note symmetricDecryptFileContent() can decrypt files created using this method
 	 */
 	public static function multiKeyEncrypt($plainContent, array $publicKeys) {
@@ -434,13 +433,13 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Asymmetrically encrypt a file using multiple public keys
-	 * @param $encryptedContent
-	 * @param $shareKey
-	 * @param $privateKey
+	 * Asymmetrically encrypt a file using multiple public keys
+	 * @param string $encryptedContent
+	 * @param string $shareKey
+	 * @param mixed $privateKey
 	 * @return false|string
 	 * @internal param string $plainContent content to be encrypted
-	 * @returns string $plainContent decrypted string
+	 * @return string $plainContent decrypted string
 	 * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
 	 *
 	 * This function decrypts a file
@@ -468,7 +467,7 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Generates a pseudo random initialisation vector
+	 * Generates a pseudo random initialisation vector
 	 * @return String $iv generated IV
 	 */
 	private static function generateIv() {
@@ -497,8 +496,8 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Generate a pseudo random 256-bit ASCII key, used as file key
-	 * @returns $key Generated key
+	 * Generate a pseudo random 256-bit ASCII key, used as file key
+	 * @return string|false Generated key
 	 */
 	public static function generateKey() {
 
@@ -523,8 +522,8 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Get the blowfish encryption handler for a key
-	 * @param $key string (optional)
+	 * Get the blowfish encryption handler for a key
+	 * @param string $key (optional)
 	 * @return \Crypt_Blowfish blowfish object
 	 *
 	 * if the key is left out, the default handler will be used
@@ -544,7 +543,7 @@ class Crypt {
 	}
 
 	/**
-	 * @brief decrypts content using legacy blowfish system
+	 * decrypts content using legacy blowfish system
 	 * @param string $content the cleartext message you want to decrypt
 	 * @param string $passphrase
 	 * @return string cleartext content
@@ -561,7 +560,7 @@ class Crypt {
 	}
 
 	/**
-	 * @param $data
+	 * @param string $data
 	 * @param string $key
 	 * @param int $maxLength
 	 * @return string
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 8cbbe8a45a..564e97e059 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -24,7 +24,7 @@
 namespace OCA\Encryption;
 
 /**
- * @brief Class to manage registration of hooks an various helper methods
+ * Class to manage registration of hooks an various helper methods
  * @package OCA\Encryption
  */
 class Helper {
@@ -32,7 +32,7 @@ class Helper {
 	private static $tmpFileMapping; // Map tmp files to files in data/user/files
 
 	/**
-	 * @brief register share related hooks
+	 * register share related hooks
 	 *
 	 */
 	public static function registerShareHooks() {
@@ -43,7 +43,7 @@ class Helper {
 	}
 
 	/**
-	 * @brief register user related hooks
+	 * register user related hooks
 	 *
 	 */
 	public static function registerUserHooks() {
@@ -56,7 +56,7 @@ class Helper {
 	}
 
 	/**
-	 * @brief register filesystem related hooks
+	 * register filesystem related hooks
 	 *
 	 */
 	public static function registerFilesystemHooks() {
@@ -68,7 +68,7 @@ class Helper {
 	}
 
 	/**
-	 * @brief register app management related hooks
+	 * register app management related hooks
 	 *
 	 */
 	public static function registerAppHooks() {
@@ -78,7 +78,7 @@ class Helper {
 	}
 
 	/**
-	 * @brief setup user for files_encryption
+	 * setup user for files_encryption
 	 *
 	 * @param Util $util
 	 * @param string $password
@@ -100,9 +100,9 @@ class Helper {
 	}
 
 	/**
-	 * @brief enable recovery
+	 * enable recovery
 	 *
-	 * @param $recoveryKeyId
+	 * @param string $recoveryKeyId
 	 * @param string $recoveryPassword
 	 * @internal param \OCA\Encryption\Util $util
 	 * @internal param string $password
@@ -153,7 +153,7 @@ class Helper {
 			$return = true;
 
 		} else { // get recovery key and check the password
-			$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+			$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), \OCP\User::getUser());
 			$return = $util->checkRecoveryPassword($recoveryPassword);
 			if ($return) {
 				$appConfig->setValue('files_encryption', 'recoveryAdminEnabled', 1);
@@ -164,7 +164,7 @@ class Helper {
 	}
 
 	/**
-	 * @brief Check if a path is a .part file
+	 * Check if a path is a .part file
 	 * @param string $path Path that may identify a .part file
 	 * @return bool
 	 */
@@ -181,7 +181,7 @@ class Helper {
 
 
 	/**
-	 * @brief Remove .path extension from a file path
+	 * Remove .path extension from a file path
 	 * @param string $path Path that may identify a .part file
 	 * @return string File path without .part extension
 	 * @note this is needed for reusing keys
@@ -208,13 +208,13 @@ class Helper {
 	}
 
 	/**
-	 * @brief disable recovery
+	 * disable recovery
 	 *
 	 * @param string $recoveryPassword
 	 * @return bool
 	 */
 	public static function adminDisableRecovery($recoveryPassword) {
-		$util = new Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+		$util = new Util(new \OC\Files\View('/'), \OCP\User::getUser());
 		$return = $util->checkRecoveryPassword($recoveryPassword);
 
 		if ($return) {
@@ -227,7 +227,7 @@ class Helper {
 
 
 	/**
-	 * @brief checks if access is public/anonymous user
+	 * checks if access is public/anonymous user
 	 * @return bool
 	 */
 	public static function isPublicAccess() {
@@ -239,7 +239,7 @@ class Helper {
 	}
 
 	/**
-	 * @brief Format a path to be relative to the /user/files/ directory
+	 * Format a path to be relative to the /user/files/ directory
 	 * @param string $path the absolute path
 	 * @return string e.g. turns '/admin/files/test.txt' into 'test.txt'
 	 */
@@ -259,7 +259,7 @@ class Helper {
 	}
 
 	/**
-	 * @brief try to get the user from the path if no user is logged in
+	 * try to get the user from the path if no user is logged in
 	 * @param string $path
 	 * @return mixed user or false if we couldn't determine a user
 	 */
@@ -294,7 +294,7 @@ class Helper {
 	}
 
 	/**
-	 * @brief get path to the corresponding file in data/user/files if path points
+	 * get path to the corresponding file in data/user/files if path points
 	 *        to a version or to a file in cache
 	 * @param string $path path to a version or a file in the trash
 	 * @return string path to corresponding file relative to data/user/files
@@ -327,12 +327,12 @@ class Helper {
 	}
 
 	/**
-	 * @brief create directory recursively
+	 * create directory recursively
 	 * @param string $path
 	 * @param \OC\Files\View $view
 	 */
 	public static function mkdirr($path, $view) {
-		$dirname = \OC_Filesystem::normalizePath(dirname($path));
+		$dirname = \OC\Files\Filesystem::normalizePath(dirname($path));
 		$dirParts = explode('/', $dirname);
 		$dir = "";
 		foreach ($dirParts as $part) {
@@ -344,7 +344,7 @@ class Helper {
 	}
 
 	/**
-	 * @brief redirect to a error page
+	 * redirect to a error page
 	 * @param Session $session
 	 */
 	public static function redirectToErrorPage($session, $errorCode = null) {
@@ -428,7 +428,7 @@ class Helper {
 	}
 
 	/**
-	 * @brief glob uses different pattern than regular expressions, escape glob pattern only
+	 * glob uses different pattern than regular expressions, escape glob pattern only
 	 * @param string $path unescaped path
 	 * @return string path
 	 */
@@ -437,7 +437,7 @@ class Helper {
 	}
 
 	/**
-	 * @brief remember from which file the tmp file (getLocalFile() call) was created
+	 * remember from which file the tmp file (getLocalFile() call) was created
 	 * @param string $tmpFile path of tmp file
 	 * @param string $originalFile path of the original file relative to data/
 	 */
@@ -446,7 +446,7 @@ class Helper {
 	}
 
 	/**
-	 * @brief get the path of the original file
+	 * get the path of the original file
 	 * @param string $tmpFile path of the tmp file
 	 * @return string|false path of the original file or false
 	 */
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index cb9f5e64af..3c51c5efba 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -24,20 +24,20 @@
 namespace OCA\Encryption;
 
 /**
- * @brief Class to manage storage and retrieval of encryption keys
+ * Class to manage storage and retrieval of encryption keys
  * @note Where a method requires a view object, it's root must be '/'
  */
 class Keymanager {
 
 	/**
-	 * @brief retrieve the ENCRYPTED private key from a user
+	 * retrieve the ENCRYPTED private key from a user
 	 *
-	 * @param \OC_FilesystemView $view
+	 * @param \OC\Files\View $view
 	 * @param string $user
 	 * @return string private key or false (hopefully)
 	 * @note the key returned by this method must be decrypted before use
 	 */
-	public static function getPrivateKey(\OC_FilesystemView $view, $user) {
+	public static function getPrivateKey(\OC\Files\View $view, $user) {
 
 		$path = '/' . $user . '/' . 'files_encryption' . '/' . $user . '.private.key';
 		$key = false;
@@ -55,12 +55,12 @@ class Keymanager {
 	}
 
 	/**
-	 * @brief retrieve public key for a specified user
-	 * @param \OC_FilesystemView $view
-	 * @param $userId
+	 * retrieve public key for a specified user
+	 * @param \OC\Files\View $view
+	 * @param string $userId
 	 * @return string public key or false
 	 */
-	public static function getPublicKey(\OC_FilesystemView $view, $userId) {
+	public static function getPublicKey(\OC\Files\View $view, $userId) {
 
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
@@ -74,12 +74,12 @@ class Keymanager {
 	}
 
 	/**
-	 * @brief Retrieve a user's public and private key
-	 * @param \OC_FilesystemView $view
-	 * @param $userId
+	 * Retrieve a user's public and private key
+	 * @param \OC\Files\View $view
+	 * @param string $userId
 	 * @return array keys: privateKey, publicKey
 	 */
-	public static function getUserKeys(\OC_FilesystemView $view, $userId) {
+	public static function getUserKeys(\OC\Files\View $view, $userId) {
 
 		return array(
 			'publicKey' => self::getPublicKey($view, $userId),
@@ -89,12 +89,12 @@ class Keymanager {
 	}
 
 	/**
-	 * @brief Retrieve public keys for given users
-	 * @param \OC_FilesystemView $view
+	 * Retrieve public keys for given users
+	 * @param \OC\Files\View $view
 	 * @param array $userIds
 	 * @return array of public keys for the specified users
 	 */
-	public static function getPublicKeys(\OC_FilesystemView $view, array $userIds) {
+	public static function getPublicKeys(\OC\Files\View $view, array $userIds) {
 
 		$keys = array();
 
@@ -109,9 +109,9 @@ class Keymanager {
 	}
 
 	/**
-	 * @brief store file encryption key
+	 * store file encryption key
 	 *
-	 * @param \OC_FilesystemView $view
+	 * @param \OC\Files\View $view
 	 * @param \OCA\Encryption\Util $util
 	 * @param string $path relative path of the file, including filename
 	 * @param string $catfile keyfile content
@@ -119,7 +119,7 @@ class Keymanager {
 	 * @note The keyfile is not encrypted here. Client code must
 	 * asymmetrically encrypt the keyfile before passing it to this method
 	 */
-	public static function setFileKey(\OC_FilesystemView $view, $util, $path, $catfile) {
+	public static function setFileKey(\OC\Files\View $view, $util, $path, $catfile) {
 
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
@@ -167,8 +167,8 @@ class Keymanager {
 	}
 
 	/**
-	 * @brief retrieve keyfile for an encrypted file
-	 * @param \OC_FilesystemView $view
+	 * retrieve keyfile for an encrypted file
+	 * @param \OC\Files\View $view
 	 * @param \OCA\Encryption\Util $util
 	 * @param string|false $filePath
 	 * @internal param \OCA\Encryption\file $string name
@@ -210,9 +210,9 @@ class Keymanager {
 	}
 
 	/**
-	 * @brief Delete a keyfile
+	 * Delete a keyfile
 	 *
-	 * @param \OC_FilesystemView $view
+	 * @param \OC\Files\View $view
 	 * @param string $path path of the file the key belongs to
 	 * @param string $userId the user to whom the file belongs
 	 * @return bool Outcome of unlink operation
@@ -266,7 +266,7 @@ class Keymanager {
 	}
 
 	/**
-	 * @brief store private key from the user
+	 * store private key from the user
 	 * @param string $key
 	 * @return bool
 	 * @note Encryption of the private key must be performed by client code
@@ -276,7 +276,7 @@ class Keymanager {
 
 		$user = \OCP\User::getUser();
 
-		$view = new \OC_FilesystemView('/' . $user . '/files_encryption');
+		$view = new \OC\Files\View('/' . $user . '/files_encryption');
 
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
@@ -293,16 +293,16 @@ class Keymanager {
 	}
 
 	/**
-	 * @brief store share key
+	 * store share key
 	 *
-	 * @param \OC_FilesystemView $view
+	 * @param \OC\Files\View $view
 	 * @param string $path where the share key is stored
-	 * @param $shareKey
+	 * @param string $shareKey
 	 * @return bool true/false
 	 * @note The keyfile is not encrypted here. Client code must
 	 * asymmetrically encrypt the keyfile before passing it to this method
 	 */
-	private static function setShareKey(\OC_FilesystemView $view, $path, $shareKey) {
+	private static function setShareKey(\OC\Files\View $view, $path, $shareKey) {
 
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
@@ -319,14 +319,14 @@ class Keymanager {
 	}
 
 	/**
-	 * @brief store multiple share keys for a single file
-	 * @param \OC_FilesystemView $view
+	 * store multiple share keys for a single file
+	 * @param \OC\Files\View $view
 	 * @param \OCA\Encryption\Util $util
 	 * @param string $path
 	 * @param array $shareKeys
 	 * @return bool
 	 */
-	public static function setShareKeys(\OC_FilesystemView $view, $util, $path, array $shareKeys) {
+	public static function setShareKeys(\OC\Files\View $view, $util, $path, array $shareKeys) {
 
 		// $shareKeys must be  an array with the following format:
 		// [userId] => [encrypted key]
@@ -365,8 +365,8 @@ class Keymanager {
 	}
 
 	/**
-	 * @brief retrieve shareKey for an encrypted file
-	 * @param \OC_FilesystemView $view
+	 * retrieve shareKey for an encrypted file
+	 * @param \OC\Files\View $view
 	 * @param string $userId
 	 * @param \OCA\Encryption\Util $util
 	 * @param string $filePath
@@ -374,7 +374,7 @@ class Keymanager {
 	 * @note The sharekey returned is encrypted. Decryption
 	 * of the keyfile must be performed by client code
 	 */
-	public static function getShareKey(\OC_FilesystemView $view, $userId, $util, $filePath) {
+	public static function getShareKey(\OC\Files\View $view, $userId, $util, $filePath) {
 
 		// try reusing key file if part file
 		$proxyStatus = \OC_FileProxy::$enabled;
@@ -406,8 +406,8 @@ class Keymanager {
 	}
 
 	/**
-	 * @brief delete all share keys of a given file
-	 * @param \OC_FilesystemView $view
+	 * delete all share keys of a given file
+	 * @param \OC\Files\View $view
 	 * @param string $userId owner of the file
 	 * @param string $filePath path to the file, relative to the owners file dir
 	 */
@@ -445,9 +445,9 @@ class Keymanager {
 	}
 
 	/**
-	 * @brief Delete a single user's shareKey for a single file
+	 * Delete a single user's shareKey for a single file
 	 */
-	public static function delShareKey(\OC_FilesystemView $view, $userIds, $filePath) {
+	public static function delShareKey(\OC\Files\View $view, $userIds, $filePath) {
 
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
@@ -486,7 +486,7 @@ class Keymanager {
 	}
 
 	/**
-	 * @brief recursively delete share keys from given users
+	 * recursively delete share keys from given users
 	 *
 	 * @param string $dir directory
 	 * @param array $userIds user ids for which the share keys should be deleted
@@ -512,11 +512,11 @@ class Keymanager {
 	}
 
 	/**
-	 * @brief Make preparations to vars and filesystem for saving a keyfile
+	 * Make preparations to vars and filesystem for saving a keyfile
 	 * @param string|boolean $path
 	 * @param string $basePath
 	 */
-	public static function keySetPreparation(\OC_FilesystemView $view, $path, $basePath, $userId) {
+	public static function keySetPreparation(\OC\Files\View $view, $path, $basePath, $userId) {
 
 		$targetPath = ltrim($path, '/');
 
@@ -542,7 +542,7 @@ class Keymanager {
 	}
 
 	/**
-	 * @brief extract filename from share key name
+	 * extract filename from share key name
 	 * @param string $shareKey (filename.userid.sharekey)
 	 * @return string|false filename or false
 	 */
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index ae2d8d63e2..ae3df834e9 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -24,7 +24,7 @@
  */
 
 /**
- * @brief Encryption proxy which handles filesystem operations before and after
+ * Encryption proxy which handles filesystem operations before and after
  *        execution and encrypts, and handles keyfiles accordingly. Used for
  *        webui.
  */
@@ -53,10 +53,11 @@ class Proxy extends \OC_FileProxy {
 	private static function shouldEncrypt($path, $mode = 'w') {
 
 		$userId = Helper::getUser($path);
+		$session = new Session(new \OC\Files\View());
 
 		// don't call the crypt stream wrapper, if...
 		if (
-				\OCP\App::isEnabled('files_encryption') === false // encryption is disabled
+				$session->getInitialized() !== Session::INIT_SUCCESSFUL // encryption successful initialized
 				|| 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
@@ -64,7 +65,7 @@ class Proxy extends \OC_FileProxy {
 			return false;
 		}
 
-		$view = new \OC_FilesystemView('');
+		$view = new \OC\Files\View('');
 		$util = new Util($view, $userId);
 
 		// for write operation we always encrypt the files, for read operations
@@ -78,8 +79,8 @@ class Proxy extends \OC_FileProxy {
 	}
 
 	/**
-	 * @param $path
-	 * @param $data
+	 * @param string $path
+	 * @param string $data
 	 * @return bool
 	 */
 	public function preFile_put_contents($path, &$data) {
@@ -89,7 +90,7 @@ class Proxy extends \OC_FileProxy {
 			if (!is_resource($data)) {
 
 				// get root view
-				$view = new \OC_FilesystemView('/');
+				$view = new \OC\Files\View('/');
 
 				// get relative path
 				$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
@@ -100,7 +101,7 @@ class Proxy extends \OC_FileProxy {
 
 				// create random cache folder
 				$cacheFolder = rand();
-				$path_slices = explode('/', \OC_Filesystem::normalizePath($path));
+				$path_slices = explode('/', \OC\Files\Filesystem::normalizePath($path));
 				$path_slices[2] = "cache/".$cacheFolder;
 				$tmpPath = implode('/', $path_slices);
 
@@ -124,7 +125,7 @@ class Proxy extends \OC_FileProxy {
 					// in the post proxy
 					$tmpFileInfo = $view->getFileInfo($tmpPath);
 					if ( isset($tmpFileInfo['size']) ) {
-						self::$unencryptedSizes[\OC_Filesystem::normalizePath($path)] = $tmpFileInfo['size'];
+						self::$unencryptedSizes[\OC\Files\Filesystem::normalizePath($path)] = $tmpFileInfo['size'];
 					}
 
 					// remove our temp file
@@ -143,15 +144,15 @@ class Proxy extends \OC_FileProxy {
 	}
 
 	/**
-	 * @brief update file cache with the new unencrypted size after file was written
+	 * update file cache with the new unencrypted size after file was written
 	 * @param string $path
 	 * @param mixed $result
 	 * @return mixed
 	 */
 	public function postFile_put_contents($path, $result) {
-		$normalizedPath = \OC_Filesystem::normalizePath($path);
+		$normalizedPath = \OC\Files\Filesystem::normalizePath($path);
 		if ( isset(self::$unencryptedSizes[$normalizedPath]) ) {
-			$view = new \OC_FilesystemView('/');
+			$view = new \OC\Files\View('/');
 			$view->putFileInfo($normalizedPath,
 					array('encrypted' => true, 'unencrypted_size' => self::$unencryptedSizes[$normalizedPath]));
 			unset(self::$unencryptedSizes[$normalizedPath]);
@@ -167,7 +168,7 @@ class Proxy extends \OC_FileProxy {
 	public function postFile_get_contents($path, $data) {
 
 		$plainData = null;
-		$view = new \OC_FilesystemView('/');
+		$view = new \OC\Files\View('/');
 
 		// init session
 		$session = new \OCA\Encryption\Session($view);
@@ -211,7 +212,7 @@ class Proxy extends \OC_FileProxy {
 	}
 
 	/**
-	 * @brief remember initial fopen mode because sometimes it gets changed during the request
+	 * remember initial fopen mode because sometimes it gets changed during the request
 	 * @param string $path path
 	 * @param string $mode type of access
 	 */
@@ -224,8 +225,8 @@ class Proxy extends \OC_FileProxy {
 
 
 	/**
-	 * @param $path
-	 * @param $result
+	 * @param string $path
+	 * @param resource $result
 	 * @return resource
 	 */
 	public function postFopen($path, &$result) {
@@ -260,8 +261,8 @@ class Proxy extends \OC_FileProxy {
 	}
 
 	/**
-	 * @param $path
-	 * @param $data
+	 * @param string $path
+	 * @param array $data
 	 * @return array
 	 */
 	public function postGetFileInfo($path, $data) {
@@ -284,13 +285,13 @@ class Proxy extends \OC_FileProxy {
 	}
 
 	/**
-	 * @param $path
-	 * @param $size
-	 * @return bool
+	 * @param string $path
+	 * @param int $size
+	 * @return int|bool
 	 */
 	public function postFileSize($path, $size) {
 
-		$view = new \OC_FilesystemView('/');
+		$view = new \OC\Files\View('/');
 
 		$userId = Helper::getUser($path);
 		$util = new Util($view, $userId);
@@ -339,26 +340,24 @@ class Proxy extends \OC_FileProxy {
 				$fileInfo['unencrypted_size'] = $fixSize;
 				// put file info if not .part file
 				if (!Helper::isPartialFilePath($relativePath)) {
-					$view->putFileInfo($path, $fileInfo);
+					$view->putFileInfo($path, array('unencrypted_size' => $fixSize));
 				}
 			}
 			$size = $fileInfo['unencrypted_size'];
 		} else {
-			// self healing if file was removed from file cache
-			if (!$fileInfo) {
-				$fileInfo = array();
-			}
+
+			$fileInfoUpdates = array();
 
 			$fixSize = $util->getFileSize($path);
 			if ($fixSize > 0) {
 				$size = $fixSize;
 
-				$fileInfo['encrypted'] = true;
-				$fileInfo['unencrypted_size'] = $size;
+				$fileInfoUpdates['encrypted'] = true;
+				$fileInfoUpdates['unencrypted_size'] = $size;
 
 				// put file info if not .part file
 				if (!Helper::isPartialFilePath($relativePath)) {
-					$view->putFileInfo($path, $fileInfo);
+					$view->putFileInfo($path, $fileInfoUpdates);
 				}
 			}
 
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 3daaa06425..93be6691f9 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -36,8 +36,8 @@ class Session {
 
 
 	/**
-	 * @brief if session is started, check if ownCloud key pair is set up, if not create it
-	 * @param \OC_FilesystemView $view
+	 * if session is started, check if ownCloud key pair is set up, if not create it
+	 * @param \OC\Files\View $view
 	 *
 	 * @note The ownCloud key pair is used to allow public link sharing even if encryption is enabled
 	 */
@@ -105,7 +105,7 @@ class Session {
 	}
 
 	/**
-	 * @brief Sets user private key to session
+	 * Sets user private key to session
 	 * @param string $privateKey
 	 * @return bool
 	 *
@@ -120,8 +120,8 @@ class Session {
 	}
 
 	/**
-	 * @brief Sets status of encryption app
-	 * @param string $init  INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INOITIALIZED
+	 * Sets status of encryption app
+	 * @param string $init INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INITIALIZED
 	 * @return bool
 	 *
 	 * @note this doesn not indicate of the init was successful, we just remeber the try!
@@ -135,7 +135,7 @@ class Session {
 	}
 
 	/**
-	 * @brief remove encryption keys and init status from session
+	 * remove encryption keys and init status from session
 	 */
 	public function closeSession() {
 		\OC::$session->remove('encryptionInitialized');
@@ -144,8 +144,8 @@ class Session {
 
 
 	/**
-	 * @brief Gets status if we already tried to initialize the encryption app
-	 * @returns init status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INOITIALIZED
+	 * Gets status if we already tried to initialize the encryption app
+	 * @return string init status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INITIALIZED
 	 *
 	 * @note this doesn not indicate of the init was successful, we just remeber the try!
 	 */
@@ -158,8 +158,8 @@ class Session {
 	}
 
 	/**
-	 * @brief Gets user or public share private key from session
-	 * @returns string $privateKey The user's plaintext private key
+	 * Gets user or public share private key from session
+	 * @return string $privateKey The user's plaintext private key
 	 *
 	 */
 	public function getPrivateKey() {
@@ -176,7 +176,7 @@ class Session {
 	}
 
 	/**
-	 * @brief Sets public user private key to session
+	 * Sets public user private key to session
 	 * @param string $privateKey
 	 * @return bool
 	 */
@@ -189,8 +189,8 @@ class Session {
 	}
 
 	/**
-	 * @brief Gets public share private key from session
-	 * @returns string $privateKey
+	 * Gets public share private key from session
+	 * @return string $privateKey
 	 *
 	 */
 	public function getPublicSharePrivateKey() {
@@ -204,7 +204,7 @@ class Session {
 
 
 	/**
-	 * @brief Sets user legacy key to session
+	 * Sets user legacy key to session
 	 * @param string $legacyKey
 	 * @return bool
 	 */
@@ -216,8 +216,8 @@ class Session {
 	}
 
 	/**
-	 * @brief Gets user legacy key from session
-	 * @returns string $legacyKey The user's plaintext legacy key
+	 * Gets user legacy key from session
+	 * @return string $legacyKey The user's plaintext legacy key
 	 *
 	 */
 	public function getLegacyKey() {
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index df5de55886..341114214d 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -31,7 +31,7 @@
 namespace OCA\Encryption;
 
 /**
- * @brief Provides 'crypt://' stream wrapper protocol.
+ * Provides 'crypt://' stream wrapper protocol.
  * @note We use a stream wrapper because it is the most secure way to handle
  * decrypted content transfers. There is no safe way to decrypt the entire file
  * somewhere on the server, so we have to encrypt and decrypt blocks on the fly.
@@ -79,10 +79,10 @@ class Stream {
 	private $privateKey;
 
 	/**
-	 * @param $path raw path relative to data/
-	 * @param $mode
-	 * @param $options
-	 * @param $opened_path
+	 * @param string $path raw path relative to data/
+	 * @param string $mode
+	 * @param int $options
+	 * @param string $opened_path
 	 * @return bool
 	 */
 	public function stream_open($path, $mode, $options, &$opened_path) {
@@ -91,7 +91,7 @@ class Stream {
 		$this->newFile = false;
 
 		if (!isset($this->rootView)) {
-			$this->rootView = new \OC_FilesystemView('/');
+			$this->rootView = new \OC\Files\View('/');
 		}
 
 		$this->session = new \OCA\Encryption\Session($this->rootView);
@@ -179,15 +179,15 @@ class Stream {
 	}
 
 	/**
-	 * @brief Returns the current position of the file pointer
-	 * @return int  position of the file pointer
+	 * Returns the current position of the file pointer
+	 * @return int position of the file pointer
 	 */
 	public function stream_tell() {
 		return ftell($this->handle);
 	}
 
 	/**
-	 * @param $offset
+	 * @param int $offset
 	 * @param int $whence
 	 * @return bool true if fseek was successful, otherwise false
 	 */
@@ -202,7 +202,7 @@ class Stream {
 	}
 
 	/**
-	 * @param $count
+	 * @param int $count
 	 * @return bool|string
 	 * @throws \Exception
 	 */
@@ -246,7 +246,7 @@ class Stream {
 	}
 
 	/**
-	 * @brief Encrypt and pad data ready for writing to disk
+	 * Encrypt and pad data ready for writing to disk
 	 * @param string $plainData data to be encrypted
 	 * @param string $key key to use for encryption
 	 * @return string encrypted data on success, false on failure
@@ -267,7 +267,7 @@ class Stream {
 	}
 
 	/**
-	 * @brief Fetch the plain encryption key for the file and set it as plainKey property
+	 * Fetch the plain encryption key for the file and set it as plainKey property
 	 * @internal param bool $generate if true, a new key will be generated if none can be found
 	 * @return bool true on key found and set, false on key not found and new key generated and set
 	 */
@@ -318,7 +318,7 @@ class Stream {
 	}
 
 	/**
-	 * @brief Handle plain data from the stream, and write it in 8192 byte blocks
+	 * Handle plain data from the stream, and write it in 8192 byte blocks
 	 * @param string $data data to be written to disk
 	 * @note the data will be written to the path stored in the stream handle, set in stream_open()
 	 * @note $data is only ever be a maximum of 8192 bytes long. This is set by PHP internally. stream_write() is called multiple times in a loop on data larger than 8192 bytes
@@ -426,9 +426,9 @@ class Stream {
 
 
 	/**
-	 * @param $option
-	 * @param $arg1
-	 * @param $arg2
+	 * @param int $option
+	 * @param int $arg1
+	 * @param int|null $arg2
 	 */
 	public function stream_set_option($option, $arg1, $arg2) {
 		$return = false;
@@ -454,7 +454,7 @@ class Stream {
 	}
 
 	/**
-	 * @param $mode
+	 * @param int $mode
 	 */
 	public function stream_lock($mode) {
 		return flock($this->handle, $mode);
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 6372ab31b6..d20efc3ac7 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -25,8 +25,8 @@
 namespace OCA\Encryption;
 
 /**
- * @brief Class for utilities relating to encrypted file storage system
- * @param \OC_FilesystemView $view expected to have OC '/' as root path
+ * Class for utilities relating to encrypted file storage system
+ * @param \OC\Files\View $view expected to have OC '/' as root path
  * @param string $userId ID of the logged in user
  * @param int $client indicating status of client side encryption. Currently
  * unused, likely to become obsolete shortly
@@ -38,7 +38,7 @@ class Util {
 	const MIGRATION_IN_PROGRESS = -1; // migration is running
 	const MIGRATION_OPEN = 0;         // user still needs to be migrated
 
-	private $view; // OC_FilesystemView object for filesystem operations
+	private $view; // OC\Files\View object for filesystem operations
 	private $userId; // ID of the user we use to encrypt/decrypt files
 	private $keyId; // ID of the key we want to manipulate
 	private $client; // Client side encryption mode flag
@@ -53,8 +53,8 @@ class Util {
 	private $isPublic;
 
 	/**
-	 * @param \OC_FilesystemView $view
-	 * @param $userId
+	 * @param \OC\Files\View $view
+	 * @param string $userId
 	 * @param bool $client
 	 */
 	public function __construct($view, $userId, $client = false) {
@@ -111,7 +111,7 @@ class Util {
 	}
 
 	/**
-	 * @brief check if the users private & public key exists
+	 * check if the users private & public key exists
 	 * @return boolean
 	 */
 	public function userKeysExists() {
@@ -125,7 +125,7 @@ class Util {
 	}
 
 	/**
-	 * @brief Sets up user folders and keys for serverside encryption
+	 * Sets up user folders and keys for serverside encryption
 	 *
 	 * @param string $passphrase to encrypt server-stored private key with
 	 * @return bool
@@ -222,7 +222,7 @@ class Util {
 	}
 
 	/**
-	 * @brief Check whether pwd recovery is enabled for a given user
+	 * Check whether pwd recovery is enabled for a given user
 	 * @return bool 1 = yes, 0 = no, false = no record
 	 *
 	 * @note If records are not being returned, check for a hidden space
@@ -264,7 +264,7 @@ class Util {
 	}
 
 	/**
-	 * @brief Enable / disable pwd recovery for a given user
+	 * Enable / disable pwd recovery for a given user
 	 * @param bool $enabled Whether to enable or disable recovery
 	 * @return bool
 	 */
@@ -300,7 +300,7 @@ class Util {
 	}
 
 	/**
-	 * @brief Find all files and their encryption status within a directory
+	 * Find all files and their encryption status within a directory
 	 * @param string $directory The path of the parent directory to search
 	 * @param bool $found the founded files if called again
 	 * @return mixed false if 0 found, array on success. Keys: name, path
@@ -421,7 +421,7 @@ class Util {
 	}
 
 	/**
-	 * @brief Check if a given path identifies an encrypted file
+	 * Check if a given path identifies an encrypted file
 	 * @param string $path
 	 * @return boolean
 	 */
@@ -463,7 +463,7 @@ class Util {
 	}
 
 	/**
-	 * @brief get the file size of the unencrypted file
+	 * get the file size of the unencrypted file
 	 * @param string $path absolute path
 	 * @return bool
 	 */
@@ -537,7 +537,7 @@ class Util {
 	}
 
 	/**
-	 * @brief fix the file size of the encrypted file
+	 * fix the file size of the encrypted file
 	 * @param string $path absolute path
 	 * @return boolean true / false if file is encrypted
 	 */
@@ -594,7 +594,7 @@ class Util {
 	}
 
 	/**
-	 * @brief encrypt versions from given file
+	 * encrypt versions from given file
 	 * @param array $filelist list of encrypted files, relative to data/user/files
 	 * @return boolean
 	 */
@@ -640,7 +640,7 @@ class Util {
 	}
 
 	/**
-	 * @brief decrypt versions from given file
+	 * decrypt versions from given file
 	 * @param string $filelist list of decrypted files, relative to data/user/files
 	 * @return boolean
 	 */
@@ -686,7 +686,7 @@ class Util {
 	}
 
 	/**
-	 * @brief Decrypt all files
+	 * Decrypt all files
 	 * @return bool
 	 */
 	public function decryptAll() {
@@ -788,8 +788,8 @@ class Util {
 			}
 
 			if ($successful) {
-				$this->view->deleteAll($this->keyfilesPath);
-				$this->view->deleteAll($this->shareKeysPath);
+				$this->view->rename($this->keyfilesPath, $this->keyfilesPath . '.backup');
+				$this->view->rename($this->shareKeysPath, $this->shareKeysPath . '.backup');
 			}
 
 			\OC_FileProxy::$enabled = true;
@@ -799,7 +799,7 @@ class Util {
 	}
 
 	/**
-	 * @brief Encrypt all files in a directory
+	 * Encrypt all files in a directory
 	 * @param string $dirPath the directory whose files will be encrypted
 	 * @param null $legacyPassphrase
 	 * @param null $newPassphrase
@@ -926,7 +926,7 @@ class Util {
 	}
 
 	/**
-	 * @brief Return important encryption related paths
+	 * Return important encryption related paths
 	 * @param string $pathName Name of the directory to return the path of
 	 * @return string path
 	 */
@@ -970,7 +970,7 @@ class Util {
 	}
 
 	/**
-	 * @brief Filter an array of UIDs to return only ones ready for sharing
+	 * Filter an array of UIDs to return only ones ready for sharing
 	 * @param array $unfilteredUsers users to be checked for sharing readiness
 	 * @return array as multi-dimensional array. keys: ready, unready
 	 */
@@ -1017,7 +1017,7 @@ class Util {
 	}
 
 	/**
-	 * @brief Decrypt a keyfile
+	 * Decrypt a keyfile
 	 * @param string $filePath
 	 * @param string $privateKey
 	 * @return false|string
@@ -1036,7 +1036,7 @@ class Util {
 	}
 
 	/**
-	 * @brief Encrypt keyfile to multiple users
+	 * Encrypt keyfile to multiple users
 	 * @param Session $session
 	 * @param array $users list of users which should be able to access the file
 	 * @param string $filePath path of the file to be shared
@@ -1097,7 +1097,7 @@ class Util {
 	}
 
 	/**
-	 * @brief Find, sanitise and format users sharing a file
+	 * 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
@@ -1176,7 +1176,7 @@ class Util {
 	}
 
 	/**
-	 * @brief set migration status
+	 * set migration status
 	 * @param int $status
 	 * @return boolean
 	 */
@@ -1199,7 +1199,7 @@ class Util {
 	}
 
 	/**
-	 * @brief start migration mode to initially encrypt users data
+	 * start migration mode to initially encrypt users data
 	 * @return boolean
 	 */
 	public function beginMigration() {
@@ -1221,7 +1221,7 @@ class Util {
 	}
 
 	/**
-	 * @brief close migration mode after users data has been encrypted successfully
+	 * close migration mode after users data has been encrypted successfully
 	 * @return boolean
 	 */
 	public function finishMigration() {
@@ -1237,8 +1237,8 @@ class Util {
 	}
 
 	/**
-	 * @brief check if files are already migrated to the encryption system
-	 * @return migration status, false = in case of no record
+	 * check if files are already migrated to the encryption system
+	 * @return int|false migration status, false = in case of no record
 	 * @note If records are not being returned, check for a hidden space
 	 *       at the start of the uid in db
 	 */
@@ -1288,7 +1288,7 @@ class Util {
 	}
 
 	/**
-	 * @brief get uid of the owners of the file and the path to the file
+	 * get uid of the owners of the file and the path to the file
 	 * @param string $path Path of the file to check
 	 * @throws \Exception
 	 * @note $shareFilePath must be relative to data/UID/files. Files
@@ -1361,13 +1361,13 @@ class Util {
 
 			return array(
 				$fileOwnerUid,
-				\OC_Filesystem::normalizePath($filename)
+				\OC\Files\Filesystem::normalizePath($filename)
 			);
 		}
 	}
 
 	/**
-	 * @brief go recursively through a dir and collect all files and sub files.
+	 * go recursively through a dir and collect all files and sub files.
 	 * @param string $dir relative to the users files folder
 	 * @return array with list of files relative to the users files folder
 	 */
@@ -1397,9 +1397,8 @@ class Util {
 	}
 
 	/**
-	 * @brief get owner of the shared files.
-	 * @param $id
-	 * @internal param int $Id of a share
+	 * get owner of the shared files.
+	 * @param int $id ID of a share
 	 * @return string owner
 	 */
 	public function getOwnerFromSharedFile($id) {
@@ -1479,7 +1478,7 @@ class Util {
 	}
 
 	/**
-	 * @param $password
+	 * @param string $password
 	 * @return bool
 	 */
 	public function checkRecoveryPassword($password) {
@@ -1512,7 +1511,7 @@ class Util {
 	}
 
 	/**
-	 * @brief add recovery key to all encrypted files
+	 * add recovery key to all encrypted files
 	 */
 	public function addRecoveryKeys($path = '/') {
 		$dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
@@ -1522,7 +1521,7 @@ class Util {
 			if ($item['type'] === 'dir') {
 				$this->addRecoveryKeys($filePath . '/');
 			} else {
-				$session = new \OCA\Encryption\Session(new \OC_FilesystemView('/'));
+				$session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
 				$sharingEnabled = \OCP\Share::isEnabled();
 				// remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
 				$file = substr($filePath, 0, -4);
@@ -1533,7 +1532,7 @@ class Util {
 	}
 
 	/**
-	 * @brief remove recovery key to all encrypted files
+	 * remove recovery key to all encrypted files
 	 */
 	public function removeRecoveryKeys($path = '/') {
 		$dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
@@ -1551,7 +1550,7 @@ class Util {
 	}
 
 	/**
-	 * @brief decrypt given file with recovery key and encrypt it again to the owner and his new key
+	 * decrypt given file with recovery key and encrypt it again to the owner and his new key
 	 * @param string $file
 	 * @param string $privateKey recovery key to decrypt the file
 	 */
@@ -1599,7 +1598,7 @@ class Util {
 	}
 
 	/**
-	 * @brief collect all files and recover them one by one
+	 * collect all files and recover them one by one
 	 * @param string $path to look for files keys
 	 * @param string $privateKey private recovery key which is used to decrypt the files
 	 */
@@ -1619,7 +1618,7 @@ class Util {
 	}
 
 	/**
-	 * @brief recover users files in case of password lost
+	 * recover users files in case of password lost
 	 * @param string $recoveryPassword
 	 */
 	public function recoverUsersFiles($recoveryPassword) {
@@ -1638,8 +1637,8 @@ class Util {
 	}
 
 	/**
-	 * @brief check if the file is stored on a system wide mount point
-	 * @param $path relative to /data/user with leading '/'
+	 * check if the file is stored on a system wide mount point
+	 * @param string $path relative to /data/user with leading '/'
 	 * @return boolean
 	 */
 	public function isSystemWideMountPoint($path) {
@@ -1655,7 +1654,7 @@ class Util {
 	}
 
 	/**
-	 * @brief decrypt private key and add it to the current session
+	 * decrypt private key and add it to the current session
 	 * @param array $params with 'uid' and 'password'
 	 * @return mixed session or false
 	 */
@@ -1683,7 +1682,7 @@ class Util {
 	}
 
 	/*
-	 * @brief remove encryption related keys from the session
+	 * remove encryption related keys from the session
 	 */
 	public function closeEncryptionSession() {
 		$session = new \OCA\Encryption\Session($this->view);
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index 09e9df0535..e9875518f6 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -12,7 +12,7 @@
 $tmpl = new OCP\Template('files_encryption', 'settings-personal');
 
 $user = \OCP\USER::getUser();
-$view = new \OC_FilesystemView('/');
+$view = new \OC\Files\View('/');
 $util = new \OCA\Encryption\Util($view, $user);
 $session = new \OCA\Encryption\Session($view);
 
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 123943ea26..b22cd214ea 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -34,7 +34,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	public $dataUrl;
 	public $dataShort;
 	/**
-	 * @var OC_FilesystemView
+	 * @var OC\Files\View
 	 */
 	public $view;
 	public $legacyEncryptedData;
@@ -79,7 +79,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		$this->genPublicKey = $keypair['publicKey'];
 		$this->genPrivateKey = $keypair['privateKey'];
 
-		$this->view = new \OC_FilesystemView('/');
+		$this->view = new \OC\Files\View('/');
 
 		// remember files_trashbin state
 		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
@@ -157,7 +157,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 		$filename = 'tmp-' . uniqid() . '.test';
 
-		$util = new Encryption\Util(new \OC_FilesystemView(), $this->userId);
+		$util = new Encryption\Util(new \OC\Files\View(), $this->userId);
 
 		$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/'. $filename, $this->dataShort);
 
@@ -206,7 +206,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @medium
-	 * @brief Test that data that is written by the crypto stream wrapper
+	 * Test that data that is written by the crypto stream wrapper
 	 * @note Encrypted data is manually prepared and decrypted here to avoid dependency on success of stream_read
 	 * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
 	 * reassembly of its data
@@ -216,7 +216,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		// Generate a a random filename
 		$filename = 'tmp-' . uniqid() . '.test';
 
-		$util = new Encryption\Util(new \OC_FilesystemView(), $this->userId);
+		$util = new Encryption\Util(new \OC\Files\View(), $this->userId);
 
 		// Save long data as encrypted file using stream wrapper
 		$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong . $this->dataLong);
@@ -293,7 +293,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @medium
-	 * @brief Test that data that is read by the crypto stream wrapper
+	 * Test that data that is read by the crypto stream wrapper
 	 */
 	function testSymmetricStreamDecryptShortFileContent() {
 
@@ -388,7 +388,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @medium
-	 * @brief test decryption using legacy blowfish method
+	 * test decryption using legacy blowfish method
 	 */
 	function testLegacyDecryptShort() {
 
@@ -402,7 +402,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @medium
-	 * @brief test decryption using legacy blowfish method
+	 * test decryption using legacy blowfish method
 	 */
 	function testLegacyDecryptLong() {
 
@@ -660,9 +660,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 
 	/**
-	 * @brief encryption using legacy blowfish method
+	 * encryption using legacy blowfish method
 	 * @param string $data data to encrypt
-	 * @param $passwd string password
+	 * @param string $passwd password
 	 * @return string
 	 */
 	function legacyEncrypt($data, $passwd) {
diff --git a/apps/files_encryption/tests/hooks.php b/apps/files_encryption/tests/hooks.php
index 047084ca2c..fcb369c723 100644
--- a/apps/files_encryption/tests/hooks.php
+++ b/apps/files_encryption/tests/hooks.php
@@ -32,7 +32,7 @@ use OCA\Encryption;
 
 /**
  * Class Test_Encryption_Hooks
- * @brief this class provide basic hook app tests
+ * this class provide basic hook app tests
  */
 class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
 
@@ -40,7 +40,7 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
 	const TEST_ENCRYPTION_HOOKS_USER2 = "test-encryption-hooks-user2";
 
 	/**
-	 * @var \OC_FilesystemView
+	 * @var \OC\Files\View
 	 */
 	public $user1View;     // view on /data/user1/files
 	public $user2View;     // view on /data/user2/files
@@ -83,9 +83,9 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
 		\OC_User::setUserId(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1);
 
 		// init filesystem view
-		$this->user1View = new \OC_FilesystemView('/'. \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1 . '/files');
-		$this->user2View = new \OC_FilesystemView('/'. \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '/files');
-		$this->rootView = new \OC_FilesystemView('/');
+		$this->user1View = new \OC\Files\View('/'. \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1 . '/files');
+		$this->user2View = new \OC\Files\View('/'. \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '/files');
+		$this->rootView = new \OC\Files\View('/');
 
 		// init short data
 		$this->data = 'hats';
@@ -259,7 +259,7 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @brief test rename operation
+	 * test rename operation
 	 */
 	function testRenameHook() {
 
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 0caf12e91a..2bd2ddc8e6 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -29,7 +29,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 	public $pass;
 	public $stateFilesTrashbin;
 	/**
-	 * @var OC_FilesystemView
+	 * @var OC\Files\View
 	 */
 	public $view;
 	public $randomKey;
@@ -68,7 +68,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 		$this->genPublicKey = $keypair['publicKey'];
 		$this->genPrivateKey = $keypair['privateKey'];
 
-		$this->view = new \OC_FilesystemView('/');
+		$this->view = new \OC\Files\View('/');
 
 		\OC_User::setUserId(\Test_Encryption_Keymanager::TEST_USER);
 		$this->userId = \Test_Encryption_Keymanager::TEST_USER;
@@ -257,4 +257,4 @@ class TestProtectedKeymanagerMethods extends \OCA\Encryption\Keymanager {
 	public static function testGetFilenameFromShareKey($sharekey) {
 		return self::getFilenameFromShareKey($sharekey);
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index 647ee955eb..8d6bc81b08 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -33,7 +33,7 @@ use OCA\Encryption;
 
 /**
  * Class Test_Encryption_Proxy
- * @brief this class provide basic proxy app tests
+ * this class provide basic proxy app tests
  */
 class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
 
@@ -42,7 +42,7 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
 	public $userId;
 	public $pass;
 	/**
-	 * @var \OC_FilesystemView
+	 * @var \OC\Files\View
 	 */
 	public $view;     // view in /data/user/files
 	public $rootView; // view on /data/user
@@ -75,8 +75,8 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
 		$this->pass = \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1;
 
 		// init filesystem view
-		$this->view = new \OC_FilesystemView('/'. \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 . '/files');
-		$this->rootView = new \OC_FilesystemView('/'. \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 );
+		$this->view = new \OC\Files\View('/'. \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 . '/files');
+		$this->rootView = new \OC\Files\View('/'. \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 );
 
 		// init short data
 		$this->data = 'hats';
@@ -91,7 +91,7 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @medium
-	 * @brief test if postFileSize returns the unencrypted file size
+	 * test if postFileSize returns the unencrypted file size
 	 */
 	function testPostFileSize() {
 
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 512671c576..bb3d7505a5 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -48,7 +48,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 	public $filename;
 	public $dataShort;
 	/**
-	 * @var OC_FilesystemView
+	 * @var OC\Files\View
 	 */
 	public $view;
 	public $folder1;
@@ -92,7 +92,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 
 	function setUp() {
 		$this->dataShort = 'hats';
-		$this->view = new \OC_FilesystemView('/');
+		$this->view = new \OC\Files\View('/');
 
 		$this->folder1 = '/folder1';
 		$this->subfolder = '/subfolder1';
@@ -669,7 +669,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		// login as admin
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
-		$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// check if recovery password match
 		$this->assertTrue($util->checkRecoveryPassword('test123'));
@@ -777,7 +777,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		// login as user2
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
-		$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+		$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 		// enable recovery for admin
 		$this->assertTrue($util->setRecoveryForUser(1));
@@ -959,7 +959,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 
 
 	/**
-	 * @brief test moving a shared file out of the Shared folder
+	 * test moving a shared file out of the Shared folder
 	 */
 	function testRename() {
 
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index fed2e7d89d..5df9cdbe1f 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -33,7 +33,7 @@ use OCA\Encryption;
 
 /**
  * Class Test_Encryption_Stream
- * @brief this class provide basic stream tests
+ * this class provide basic stream tests
  */
 class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 
@@ -42,7 +42,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 	public $userId;
 	public $pass;
 	/**
-	 * @var \OC_FilesystemView
+	 * @var \OC\Files\View
 	 */
 	public $view;
 	public $dataShort;
@@ -71,7 +71,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 		$this->pass = \Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1;
 
 		// init filesystem view
-		$this->view = new \OC_FilesystemView('/');
+		$this->view = new \OC\Files\View('/');
 
 		// init short data
 		$this->dataShort = 'hats';
@@ -183,7 +183,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @medium
-	 * @brief test if stream wrapper can read files outside from the data folder
+	 * test if stream wrapper can read files outside from the data folder
 	 */
 	function testStreamFromLocalFile() {
 
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index 2f9ecfd9d5..5d54b7db24 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -34,7 +34,7 @@ use OCA\Encryption;
 
 /**
  * Class Test_Encryption_Trashbin
- * @brief this class provide basic trashbin app tests
+ * this class provide basic trashbin app tests
  */
 class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 
@@ -43,7 +43,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 	public $userId;
 	public $pass;
 	/**
-	 * @var \OC_FilesystemView
+	 * @var \OC\Files\View
 	 */
 	public $view;
 	public $dataShort;
@@ -81,7 +81,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 		$this->pass = \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1;
 
 		// init filesystem view
-		$this->view = new \OC_FilesystemView('/');
+		$this->view = new \OC\Files\View('/');
 
 		// init short data
 		$this->dataShort = 'hats';
@@ -114,7 +114,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @medium
-	 * @brief test delete file
+	 * test delete file
 	 */
 	function testDeleteFile() {
 
@@ -186,7 +186,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @medium
-	 * @brief test restore file
+	 * test restore file
 	 *
 	 * @depends testDeleteFile
 	 */
@@ -218,7 +218,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @medium
-	 * @brief test delete file forever
+	 * test delete file forever
 	 */
 	function testPermanentDeleteFile() {
 
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index a29ef831a5..a4dcc5cc8b 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -29,7 +29,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 	public $publicKeyDir;
 	public $pass;
 	/**
-	 * @var OC_FilesystemView
+	 * @var OC\Files\View
 	 */
 	public $view;
 	public $keyfilesPath;
@@ -92,7 +92,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		$this->privateKeyPath =
 			$this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
 
-		$this->view = new \OC_FilesystemView('/');
+		$this->view = new \OC\Files\View('/');
 
 		$this->util = new Encryption\Util($this->view, $this->userId);
 
@@ -121,7 +121,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @medium
-	 * @brief test that paths set during User construction are correct
+	 * test that paths set during User construction are correct
 	 */
 	function testKeyPaths() {
 		$util = new Encryption\Util($this->view, $this->userId);
@@ -136,7 +136,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @medium
-	 * @brief test detection of encrypted files
+	 * test detection of encrypted files
 	 */
 	function testIsEncryptedPath() {
 
@@ -171,7 +171,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @medium
-	 * @brief test setup of encryption directories
+	 * test setup of encryption directories
 	 */
 	function testSetupServerSide() {
 		$this->assertEquals(true, $this->util->setupServerSide($this->pass));
@@ -179,14 +179,14 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @medium
-	 * @brief test checking whether account is ready for encryption,
+	 * test checking whether account is ready for encryption,
 	 */
 	function testUserIsReady() {
 		$this->assertEquals(true, $this->util->ready());
 	}
 
 	/**
-	 * @brief test checking whether account is not ready for encryption,
+	 * test checking whether account is not ready for encryption,
 	 */
 //	function testUserIsNotReady() {
 //		$this->view->unlink($this->publicKeyDir);
@@ -200,12 +200,12 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @medium
-	 * @brief test checking whether account is not ready for encryption,
+	 * test checking whether account is not ready for encryption,
 	 */
 	function testIsLegacyUser() {
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
 
-		$userView = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+		$userView = new \OC\Files\View('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
 
 		// Disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
@@ -279,7 +279,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-<	 * @brief Test that data that is read by the crypto stream wrapper
+<	 * Test that data that is read by the crypto stream wrapper
 	 */
 	function testGetFileSize() {
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
@@ -349,10 +349,12 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		$this->view->unlink($this->userId . '/files/' . $filename);
 	}
 
-
 	function testDecryptAll() {
 
 		$filename = "/decryptAll" . uniqid() . ".txt";
+		$datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data/');
+		$userdir = $datadir . '/' . $this->userId . '/files/';
+
 		$util = new Encryption\Util($this->view, $this->userId);
 
 		$this->view->file_put_contents($this->userId . '/files/' . $filename, $this->dataShort);
@@ -362,13 +364,47 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		$this->assertTrue($fileInfoEncrypted instanceof \OC\Files\FileInfo);
 		$this->assertEquals($fileInfoEncrypted['encrypted'], 1);
 
-		// decrypt all encrypted files
-		$result = $util->decryptAll('/' . $this->userId . '/' . 'files');
+		$encContent = file_get_contents($userdir . $filename);
 
-		$this->assertTrue($result);
+		\OC_App::disable('files_encryption');
+
+		$user = \OCP\User::getUser();
+		$this->logoutHelper();
+		$this->loginHelper($user, false, false, false);
+
+		$content = file_get_contents($userdir . $filename);
+
+		//content should be encrypted
+		$this->assertSame($encContent, $content);
+
+		// now we load the encryption app again
+		OC_App::loadApp('files_encryption');
+
+		// init encryption app
+		$params = array('uid' => \OCP\User::getUser(),
+			'password' => \OCP\User::getUser());
+
+		$view = new OC\Files\View('/');
+		$util = new \OCA\Encryption\Util($view, \OCP\User::getUser());
+
+		$result = $util->initEncryption($params);
+
+		$this->assertTrue($result instanceof \OCA\Encryption\Session);
+
+		$successful = $util->decryptAll();
+
+		$this->assertTrue($successful);
+
+		$this->logoutHelper();
+		$this->loginHelper($user, false, false, false);
+
+		// file should be unencrypted and fileInfo should contain the correct values
+		$content = file_get_contents($userdir . $filename);
+
+		// now we should get the plain data
+		$this->assertSame($this->dataShort, $content);
 
 		$fileInfoUnencrypted = $this->view->getFileInfo($this->userId . '/files/' . $filename);
-
 		$this->assertTrue($fileInfoUnencrypted instanceof \OC\Files\FileInfo);
 
 		// check if mtime and etags unchanged
@@ -377,10 +413,21 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		// file should no longer be encrypted
 		$this->assertEquals(0, $fileInfoUnencrypted['encrypted']);
 
+		// check if the keys where moved to the backup location
+		$this->assertTrue($this->view->is_dir($this->userId . '/files_encryption/keyfiles.backup'));
+		$this->assertTrue($this->view->file_exists($this->userId . '/files_encryption/keyfiles.backup/' . $filename . '.key'));
+		$this->assertTrue($this->view->is_dir($this->userId . '/files_encryption/share-keys.backup'));
+		$this->assertTrue($this->view->file_exists($this->userId . '/files_encryption/share-keys.backup/' . $filename . '.' . $user . '.shareKey'));
+
+		// cleanup
 		$this->view->unlink($this->userId . '/files/' . $filename);
+		$this->view->deleteAll($this->userId . '/files_encryption/keyfiles.backup');
+		$this->view->deleteAll($this->userId . '/files_encryption/share-keys.backup');
+		OC_App::enable('files_encryption');
 
 	}
 
+
 	function testDescryptAllWithBrokenFiles() {
 
 		$file1 = "/decryptAll1" . uniqid() . ".txt";
@@ -446,8 +493,11 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		$this->assertFalse($this->view->is_dir($this->userId . '/files_encryption/keyfiles/'));
 		$this->assertFalse($this->view->is_dir($this->userId . '/files_encryption/share-keys/'));
 
+		//cleanup
 		$this->view->unlink($this->userId . '/files/' . $file1);
 		$this->view->unlink($this->userId . '/files/' . $file2);
+		$this->view->deleteAll($this->userId . '/files_encryption/keyfiles.backup');
+		$this->view->deleteAll($this->userId . '/files_encryption/share-keys.backup');
 
 	}
 
@@ -457,8 +507,8 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 	function testEncryptLegacyFiles() {
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
 
-		$userView = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
-		$view = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER . '/files');
+		$userView = new \OC\Files\View('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+		$view = new \OC\Files\View('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER . '/files');
 
 		// Disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
@@ -504,11 +554,11 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @param $user
+	 * @param string $user
 	 * @param bool $create
 	 * @param bool $password
 	 */
-	public static function loginHelper($user, $create = false, $password = false) {
+	public static function loginHelper($user, $create = false, $password = false, $loadEncryption = true) {
 		if ($create) {
 			try {
 				\OC_User::createUser($user, $user);
@@ -527,9 +577,11 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		\OC_User::setUserId($user);
 		\OC_Util::setupFS($user);
 
-		$params['uid'] = $user;
-		$params['password'] = $password;
-		OCA\Encryption\Hooks::login($params);
+		if ($loadEncryption) {
+			$params['uid'] = $user;
+			$params['password'] = $password;
+			OCA\Encryption\Hooks::login($params);
+		}
 	}
 
 	public static function logoutHelper() {
@@ -543,7 +595,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 	 * to be able to test the migration path
 	 *
 	 * @param integer $status needed migration status for test
-	 * @param $user for which user the status should be set
+	 * @param string $user for which user the status should be set
 	 * @return boolean
 	 */
 	private function setMigrationStatus($status, $user) {
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
index 1fe4c13d59..d33dc58cf9 100755
--- a/apps/files_encryption/tests/webdav.php
+++ b/apps/files_encryption/tests/webdav.php
@@ -34,7 +34,7 @@ use OCA\Encryption;
 /**
  * Class Test_Encryption_Webdav
  *
- * @brief this class provide basic webdav tests for PUT,GET and DELETE
+ * this class provide basic webdav tests for PUT,GET and DELETE
  */
 class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 
@@ -43,7 +43,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 	public $userId;
 	public $pass;
 	/**
-	 * @var \OC_FilesystemView
+	 * @var \OC\Files\View
 	 */
 	public $view;
 	public $dataShort;
@@ -82,7 +82,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 		$this->pass = \Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1;
 
 		// init filesystem view
-		$this->view = new \OC_FilesystemView('/');
+		$this->view = new \OC\Files\View('/');
 
 		// init short data
 		$this->dataShort = 'hats';
@@ -112,7 +112,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @brief test webdav put random file
+	 * test webdav put random file
 	 */
 	function testWebdavPUT() {
 
@@ -167,7 +167,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @brief test webdav get random file
+	 * test webdav get random file
 	 *
 	 * @depends testWebdavPUT
 	 */
@@ -190,7 +190,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @brief test webdav delete random file
+	 * test webdav delete random file
 	 * @depends testWebdavGET
 	 */
 	function testWebdavDELETE($filename) {
@@ -216,7 +216,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @brief handle webdav request
+	 * handle webdav request
 	 *
 	 * @param bool $body
 	 *
diff --git a/apps/files_external/3rdparty/irodsphp/LICENSE.txt b/apps/files_external/3rdparty/irodsphp/LICENSE.txt
deleted file mode 100644
index caca18c59b..0000000000
--- a/apps/files_external/3rdparty/irodsphp/LICENSE.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-iRODS license terms and copyright info from the irods site at: https://www.irods.org/index.php/License
-
-License
-iRODS Copyright and Licensing
-
-iRODS is open source software released under a BSD License, see license text in "iRODS License Terms and Conditions" below. 
-The BSD license has been described in very general terms as allowing you to do whatever you want to with the software and 
-source code as long as you acknowledge who wrote it and that, as with any open source software, there is no warranty and you're using the code "as is."
-In the spirit of collaborative open source software, the iRODS community encourages you to communicate with us, letting us know what features you like, 
-features that would be useful, problems, bugs, suggestions, etc., and to perhaps contribute source code.
-The iRODS community has formed the Data Intensive Cyberinfrastructure Foundation, a 501(c)(3) nonprofit corporation established to serve
- as the home of the iRODS open source community over the long term. If you choose to contribute new code, you'll receive full acknowledgment. All you do is complete the Contributor's Agreement, under which you retain copyright ownership
-  in your code but give a free license to the iRODS nonprofit foundation, allowing your code to be integrated into iRODS and in turn released under the BSD license.
-Note: The above text is an educational overview of iRODS open source licensing, and not intended as legal advice nor is it part of the iRODS license agreement, which is below. As always, for legal advice consult an attorney.
-
-iRODS License Terms and Conditions Notice
-
-Copyright (c) 2005-2011, Regents of the University of California, the University of North Carolina, and the Data Intensive Cyberinfrastructure Foundation 
-All rights reserved.
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-Neither the name of the University of California, San Diego (UCSD) nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT 
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/doc_config.ini b/apps/files_external/3rdparty/irodsphp/prods/doc_config.ini
deleted file mode 100644
index f72b4a230d..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/doc_config.ini
+++ /dev/null
@@ -1,87 +0,0 @@
-;; phpDocumentor demonstration parse configuration file
-;;
-;; RUN THIS FILE FROM THE INSTALL DIRECTORY
-;; CHANGE HERE:
-
-;; where should the documentation be written?
-;; legal values: a legal path
-;target = /home/CelloG/output
-target = ./doc
-
-
-;; DONT CHANGE BELOW HERE
-;;
-;; This file is designed to cut down on repetitive typing on the command-line or web interface
-;; You can copy this file to create a number of configuration files that can be used with the
-;; command-line switch -c, as in phpdoc -c default.ini or phpdoc -c myini.ini.  The web
-;; interface will automatically generate a list of .ini files that can be used.
-;;
-;; ALL .ini files must be in the user subdirectory of phpDocumentor with an extension of .ini
-;;
-;; Copyright 2002, Greg Beaver <cellog@php.net>
-;;
-;; WARNING: do not change the 
-
-[Parse Data]
-;; title of all the documentation
-;; legal values: any string
-title = PRODS (iRODS PHP Client API) Documentation
-
-;; parse files that start with a . like .bash_profile
-;; legal values: true, false
-hidden = false
-
-;; show elements marked @access private in documentation by setting this to on
-;; legal values: on, off
-parseprivate = off
-
-;; parse with javadoc-like description (first sentence is always the short description)
-;; legal values: on, off
-javadocdesc = on
-
-;target=/dev/null
-
-;; add any custom @tags separated by commas here
-;; legal values: any legal tagname separated by commas.
-;customtags = mytag1,mytag2
-
-;; what is the main package?
-;; legal values: alphanumeric string plus - and _
-defaultpackagename = Prods
-
-;; output any parsing information?  set to on for cron jobs
-;; legal values: on
-;quiet = on
-
-;; limit output to the specified packages, even if others are parsed
-;; legal values: package names separated by commas
-;packageoutput = package1,package2
-
-;; comma-separated list of files to parse
-;; legal values: paths separated by commas
-;filename = /path/to/file1,/path/to/file2,fileincurrentdirectory
-
-;; comma-separated list of directories to parse
-;; legal values: directory paths separated by commas
-;directory = /path1,/path2,.,..,subdirectory
-;directory = /home/jeichorn/cvs/pear
-;directory = /you-MUST/change-me/to-fit/your-environment
-;directory = .
-
-directory = ./src,./tutorials
-
-;; comma-separated list of files, directories or wildcards ? and * (any wildcard) to ignore
-;; legal values: any wildcard strings separated by commas
-;; remember, this pathing is RELATIVE to the top-most directory in your "directory" value
-;ignore = path/to/ignore*,*list.php,myfile.php,subdirectory/
-ignore = templates_c/,*HTML/default/*,spec/,*.inc.php,packet/,set*.php,ProdsStreamer.class.php,RODSMessage.class.php,RODSConn.class.php,RODSKeyValPair.class.php,RODSConnManager.class.php  
-
-;; comma-separated list of Converters to use in outputformat:Convertername:templatedirectory format
-;; legal values: HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib
-;;               HTML:frames:phpedit,HTML:frames:DOM/default,HTML:frames:DOM/l0l33t,HTML:frames:DOM/phpdoc.de
-;;               HTML:Smarty:default,HTML:Smarty:PHP,PDF:default:default,CHM:default:default,XML:DocBook:default
-output=HTML:Smarty:PHP
-
-;; turn this option on if you want highlighted source code for every file
-;; legal values: on/off
-sourcecode = on
diff --git a/apps/files_external/3rdparty/irodsphp/prods/release_notes.txt b/apps/files_external/3rdparty/irodsphp/prods/release_notes.txt
deleted file mode 100644
index 7e1b0549cf..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/release_notes.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-
-*'''Project''': PHP Prods API for iRODS 
-*'''Date''': 06/04/2013
-*'''Release Version''': 3.3.0-beta1
-*'''git tag''': 3.3.0-beta1
-
-==News==
-
-PHP API for iRODS
-
-This alpha is a merge of community supported additions for PAM and tickets
-
-
-GForge for iDrop-swing is at:  [[https://code.renci.org/gf/project/irodsphp/]]
-
-==Requirements==
-
-Note that the following bug and feature requests are logged in GForge with related commit information [[https://code.renci.org/gf/project/irodsphp/tracker/]]
-
-==Features==
-
-*[#1280] Add PAM support to PHP
-
-*[#1122] Add Ticket support to PHP
-
-==Bug Fixes==
-
-
-
-==Outstanding Issues==
-
-Please consult [[https://code.renci.org/gf/project/irodsphp/tracker/]]
-
-for the latest open bugs and Jargon feature requests
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/LICENSE.txt b/apps/files_external/3rdparty/irodsphp/prods/src/LICENSE.txt
deleted file mode 100644
index caca18c59b..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/LICENSE.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-iRODS license terms and copyright info from the irods site at: https://www.irods.org/index.php/License
-
-License
-iRODS Copyright and Licensing
-
-iRODS is open source software released under a BSD License, see license text in "iRODS License Terms and Conditions" below. 
-The BSD license has been described in very general terms as allowing you to do whatever you want to with the software and 
-source code as long as you acknowledge who wrote it and that, as with any open source software, there is no warranty and you're using the code "as is."
-In the spirit of collaborative open source software, the iRODS community encourages you to communicate with us, letting us know what features you like, 
-features that would be useful, problems, bugs, suggestions, etc., and to perhaps contribute source code.
-The iRODS community has formed the Data Intensive Cyberinfrastructure Foundation, a 501(c)(3) nonprofit corporation established to serve
- as the home of the iRODS open source community over the long term. If you choose to contribute new code, you'll receive full acknowledgment. All you do is complete the Contributor's Agreement, under which you retain copyright ownership
-  in your code but give a free license to the iRODS nonprofit foundation, allowing your code to be integrated into iRODS and in turn released under the BSD license.
-Note: The above text is an educational overview of iRODS open source licensing, and not intended as legal advice nor is it part of the iRODS license agreement, which is below. As always, for legal advice consult an attorney.
-
-iRODS License Terms and Conditions Notice
-
-Copyright (c) 2005-2011, Regents of the University of California, the University of North Carolina, and the Data Intensive Cyberinfrastructure Foundation 
-All rights reserved.
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-Neither the name of the University of California, San Diego (UCSD) nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT 
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php
deleted file mode 100644
index 7e0fafdad8..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-require_once("autoload.inc.php");
-require_once("ProdsConfig.inc.php");
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php
deleted file mode 100644
index 1089932a3e..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**#@+
- * Constants
- */
-
-define("RODS_REL_VERSION", 'rods1.1');
-define("RODS_API_VERSION", 'd');
-
-/**#@-*/
-
-if (file_exists(__DIR__ . "/prods.ini")) {
-  $GLOBALS['PRODS_CONFIG'] = parse_ini_file(__DIR__ . "/prods.ini", true);
-}
-else {
-  $GLOBALS['PRODS_CONFIG'] = array();
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsDir.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsDir.class.php
deleted file mode 100644
index 5c34c6ce45..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsDir.class.php
+++ /dev/null
@@ -1,730 +0,0 @@
-<?php
-/**
- * PRODS directory class
- * @author Sifang Lu <sifang@sdsc.edu>
- * @copyright Copyright &copy; 2007, TBD
- * @package Prods
- */
-
-require_once("autoload.inc.php");
-
-class ProdsDir extends ProdsPath
-{
-    /**
-     * @var RODSDirStats
-     */
-    public $stats;
-
-    private $child_dirs;
-    private $child_files;
-    private $all_children;
-    private $position;
-
-    /**
-     * Default Constructor.
-     *
-     * @param RODSAccount account iRODS account used for connection
-     * @param string $path_str the path of this dir
-     * @param boolean $verify whether verify if the path exsits
-     * @param RODSDirStats $stats if the stats for this dir is already known, initilize it here.
-     * @return a new ProdsDir
-     */
-    public function __construct(RODSAccount &$account, $path_str, $verify = false,
-                                RODSDirStats $stats = NULL)
-    {
-        $this->position = 0;
-        $this->stats = $stats;
-        parent::__construct($account, $path_str);
-        if ($verify === true) {
-            if ($this->exists() === false) {
-                throw new RODSException("Directory '$this' does not exist",
-                    'PERR_PATH_DOES_NOT_EXISTS');
-            }
-        }
-    }
-  
-
- /**
-	* Create a ProdsDir object from URI string.
-	* @param string $path the URI Sting
-	* @param boolean $verify whether verify if the path exsits
-	* @return a new ProdsDir
-	*/
-  public static function fromURI($path, $verify=false)
-  {
-    if (0!=strncmp($path,"rods://",7))
-      $path="rods://".$path;
-    $url=parse_url($path);
-
-    $host=isset($url['host'])?$url['host']:'';
-    $port=isset($url['port'])?$url['port']:'';
-
-    $user='';
-    $zone='';
-    $authtype='irods';
-    if (isset($url['user']))
-    {
-      if (strstr($url['user'],".")!==false) {
-        $user_array=@explode(".",$url['user']);
-        if (count($user_array)===3) {
-          $user=$user_array[0];
-          $zone=$user_array[1];
-          $authtype=$user_array[2];
-        }
-        else {
-          $user=$user_array[0];
-          $zone=$user_array[1];
-        }
-      }
-      else
-        $user=$url['user'];
-    }
-
-    $pass=isset($url['pass'])?$url['pass']:'';
-
-    $account=new RODSAccount($host, $port, $user, $pass, $zone, '', $authtype);
-
-    $path_str=isset($url['path'])?$url['path']:'';
-
-    // treat query and fragment as part of name
-    if (isset($url['query'])&&(strlen($url['query'])>0))
-      $path_str=$path_str.'?'.$url['query'];
-    if (isset($url['fragment'])&&(strlen($url['fragment'])>0))
-      $path_str=$path_str.'#'.$url['fragment'];
-
-    if (empty($path_str))
-      $path_str='/';
-
-    return (new ProdsDir($account,$path_str,$verify));
-  }
-
- /**
-	* Verify if this dir exist with server. This function shouldn't be called directly, use {@link exists}
-	*/
-  //protected function verify()
-  protected function verify($get_cb=array('RODSConnManager','getConn'),
-                            $rel_cb=array('RODSConnManager', 'releaseConn'))
-  {
-    //$conn = RODSConnManager::getConn($this->account);
-    $conn = call_user_func_array($get_cb, array(&$this->account));
-    $this->path_exists= $conn -> dirExists ($this->path_str);
-    //RODSConnManager::releaseConn($conn);
-    call_user_func($rel_cb, $conn);
-  }
-
- /**
-  * get next file or directory from the directory, where the internal iterator points to.
-	* @return next file or directory from the directory. The file always come first and dir comes later. return false on failure
-	*/
-  public function getNextChild()
-  {
-    if (!$this->all_children)
-      $this->all_children=$this->getAllChildren();
-    if (($this->position>=count($this->all_children))||($this->position<0))
-      return false;
-    $names=array_keys($this->all_children);
-    $ret_val=$this->all_children[$names[$this->position]];
-    $this->position++;
-    return $ret_val;
-  }
-
-
- /**
-	* Get children files of this dir.
-	*
-	* @param array $orderby An associated array specifying how to sort the result by attributes. See details in method {@link findFiles};
-	* @param int $startingInx starting index of all files. default is 0.
-	* @param int $maxresults max results returned. if negative, it returns all rows. default is -1
-	* @param int &$total_num_rows number of all results
-	* @param boolean $logical_file whether to return only logical files, if false, it returns all replica with resource name, if true, it returns only 1 logical file, with num_replica available in the stats. default is false.
-	* @return an array of ProdsFile
-	*/
-  public function getChildFiles(array $orderby=array(), $startingInx=0,
-    $maxresults=-1, &$total_num_rows=-1, $logicalFile=false)
-  {
-    $terms=array("descendantOnly"=>true,"recursive"=>false, 'logicalFile'=>$logicalFile);
-    return $this->findFiles($terms,$total_num_rows,$startingInx,$maxresults,$orderby);
-  }
-
-    /**
-     * Resets the directory stream to the beginning of the directory.
-     */
-    public function rewind()
-    {
-        $this->position = 0;
-    }
-
-
-    /**
-     * @return all children (files and dirs) of current dir
-     */
-    public function getAllChildren()
-    {
-        $this->all_children = array();
-        $this->all_children = array_merge($this->all_children,
-            $this->getChildFiles());
-        $this->all_children = array_merge($this->all_children,
-            $this->getChildDirs());
-
-        return $this->all_children;
-    }
-
-    /**
-     * Get children directories of this dir.
-     * @param $orderby An associated array specifying how to sort the result by attributes. See details in method {@link findDirs};
-     * Note that if the current dir is root '/', it will not return '/' as its child, unlike iCommand's current behavior.
-     * @return an array of ProdsDir
-     */
-    public function getChildDirs(array $orderby = array(), $startingInx = 0,
-                                 $maxresults = -1, &$total_num_rows = -1)
-    {
-        $terms = array("descendantOnly" => true, "recursive" => false);
-        return $this->findDirs($terms, $total_num_rows, $startingInx, $maxresults, $orderby);
-    }
-    
-    /**
-     * Make a new directory under this directory
-     * @param string $name full path of the new dir to be made on server
-     * @return ProdsDir the new directory just created (or already exists)
-     */
-    // public function mkdir($name)
-    public function mkdir($name,
-                          $get_cb = array('RODSConnManager', 'getConn'),
-                          $rel_cb = array('RODSConnManager', 'releaseConn'))
-    {
-        //$conn = RODSConnManager::getConn($this->account);
-        $conn = call_user_func_array($get_cb, array(&$this->account));
-        $conn->mkdir($this->path_str . "/$name");
-        //RODSConnManager::releaseConn($conn);
-        call_user_func($rel_cb, $conn);
-        return (new ProdsDir($this->account, $this->path_str . "/$name"));
-    }
-
-    /**
-     * remove this directory
-     * @param boolean $recursive whether recursively delete all child files and child directories recursively.
-     * @param boolean $force whether force delete the file/dir. If force delete, all files will be wiped physically. Else, they are moved to trash derectory.
-     * @param array   $additional_flags An array of keyval pairs (array) reprenting additional flags passed to the server/client message. Each keyval pair is an array with first element repsenting the key, and second element representing the value (default to ''). Supported keys are:
-     * -    'irodsRmTrash' - whether this rm is a rmtrash operation
-     * -    'irodsAdminRmTrash' - whether this rm is a rmtrash operation done by admin user
-     * @param mixed   $status_update_func It can be an string or array that represents the status update function (see http://us.php.net/manual/en/language.pseudo-types.php#language.types.callback), which can update status based on the server status update. Leave it blank or 'null' if there is no need to update the status. The function will be called with an assossive arry as parameter, supported fields are:
-     * - 'filesCnt' - finished number of files from previous update (normally 10 but not the last update)
-     * - 'lastObjPath' - last object that was processed.
-     * If this function returns 1, progress will be stopped.
-     */
-    // public function rmdir($recursive=true,$force=false, $additional_flags=array(),
-    //  $status_update_func=null)
-    public function rmdir($recursive = true, $force = false, $additional_flags = array(),
-                          $status_update_func = null,
-                          $get_cb = array('RODSConnManager', 'getConn'),
-                          $rel_cb = array('RODSConnManager', 'releaseConn'))
-    {
-        //$conn = RODSConnManager::getConn($this->account);
-        $conn = call_user_func_array($get_cb, array(&$this->account));
-        $conn->rmdir($this->path_str, $recursive, $force, $additional_flags,
-            $status_update_func);
-        // RODSConnManager::releaseConn($conn);
-        call_user_func($rel_cb, $conn);
-    }
-
-    /**
-     * get the dir stats
-     * @param boolean $force_reload If stats already present in the object, and this flag is true, a force reload will be done.
-     * @return RODSDirStats the stats object, note that if this object will not refresh unless $force_reload flag is used.
-     */
-    // public function getStats($force_reload=false)
-    public function getStats($force_reload = false,
-                             $get_cb = array('RODSConnManager', 'getConn'),
-                             $rel_cb = array('RODSConnManager', 'releaseConn'))
-    {
-        if (($force_reload === false) && ($this->stats))
-            return $this->stats;
-
-        //$conn = RODSConnManager::getConn($this->account);
-        $conn = call_user_func_array($get_cb, array(&$this->account));
-        $stats = $conn->getDirStats($this->path_str);
-        //RODSConnManager::releaseConn($conn);
-        call_user_func($rel_cb, $conn);
-
-        if ($stats === false) $this->stats = NULL;
-        else $this->stats = $stats;
-        return $this->stats;
-    }
-    
-    public function getACL()
-    {
-
-        $collection = $this->path_str;
-
-        $connLocal = RODSConnManager::getConn($this->account);
-        $que_result_coll = $connLocal->genQuery(
-            array("COL_COLL_INHERITANCE", "COL_COLL_NAME", "COL_COLL_OWNER_NAME", "COL_COLL_ID"),
-            array(new RODSQueryCondition("COL_COLL_NAME", $collection)));
-        
-        $users['COL_COLL_INHERITANCE'] = (int)($que_result_coll['COL_COLL_INHERITANCE'][0]);
-
-        $que_result_users = $connLocal->genQuery(
-            array("COL_DATA_ACCESS_NAME", "COL_DATA_ACCESS_USER_ID"),
-            array(new RODSQueryCondition("COL_DATA_ACCESS_DATA_ID", $que_result_coll['COL_COLL_ID'][0])));
-        
-        for($i=0; $i<sizeof($que_result_users["COL_DATA_ACCESS_USER_ID"]);$i++) {
-            $que_result_user_info = $connLocal->genQuery(
-                array("COL_USER_NAME", "COL_USER_ZONE"),
-                array(new RODSQueryCondition("COL_USER_ID", $que_result_users["COL_DATA_ACCESS_USER_ID"][$i])));
-            
-            $users['COL_USERS'][] = (object) array(
-                "COL_USER_NAME" => $que_result_user_info['COL_USER_NAME'][0],
-                "COL_USER_ZONE" => $que_result_user_info['COL_USER_ZONE'][0],
-                "COL_DATA_ACCESS_NAME" => $que_result_users['COL_DATA_ACCESS_NAME'][$i]
-            );
-        }
-        
-        RODSConnManager::releaseConn($connLocal);
-        return $users;
-        
-
-    }
-
-    /**
-     * get the dir statistics, such as total number of files under this dir
-     * @param string $fld Name of the statistics, supported values are:
-     * - num_dirs number of directories
-     * - num_files number of files
-     * @param boolean $recursive wheather recursively through the sub collections, default is true.
-     * @return result, an integer value, assosiated with the query.
-     */
-    //public function queryStatistics($fld, $recursive=true)
-    public function queryStatistics($fld, $recursive = true,
-                                    $get_cb = array('RODSConnManager', 'getConn'),
-                                    $rel_cb = array('RODSConnManager', 'releaseConn'))
-    {
-        $condition = new RODSGenQueConds();
-        $select = new RODSGenQueSelFlds();
-        $ret_data_index = '';
-        switch ($fld) {
-            case 'num_dirs' :
-                $select->add('COL_COLL_ID', 'count');
-                $ret_data_index = 'COL_COLL_ID';
-                if ($recursive === true)
-                    $condition->add('COL_COLL_NAME', 'like', $this->path_str . '/%');
-                else
-                    $condition->add('COL_COLL_PARENT_NAME', '=', $this->path_str);
-                break;
-            case 'num_files' :
-                $select->add('COL_D_DATA_ID', 'count');
-                $ret_data_index = 'COL_D_DATA_ID';
-                if ($recursive === true)
-                    $condition->add('COL_COLL_NAME', 'like', $this->path_str . '/%',
-                        array(array('op' => '=', 'val' => $this->path_str)));
-                else
-                    $condition->add('COL_COLL_NAME', '=', $this->path_str);
-                break;
-            default :
-                throw new RODSException("Query field '$fld' not supported!",
-                    'PERR_USER_INPUT_ERROR');
-        }
-
-        //$conn = RODSConnManager::getConn($this->account);
-        $conn = call_user_func_array($get_cb, array(&$this->account));
-        $results = $conn->query($select, $condition);
-        //RODSConnManager::releaseConn($conn);
-        call_user_func($rel_cb, $conn);
-        $result_values = $results->getValues();
-
-        if (isset($result_values[$ret_data_index][0]))
-            return intval($result_values[$ret_data_index][0]);
-        else {
-            throw new RODSException("Query did not get value back with expected " .
-                "index: $ret_data_index!", 'GENERAL_PRODS_ERR');
-        }
-    }
-
-    /**
-     * query metadata, and find matching files.
-     * @param array $terms an assositive array of search conditions, supported ones are:
-     * -    'name' (string) - partial name of the target (file or dir)
-     * -    'descendantOnly' (boolean) - whether to search among this directory's decendents. default is false.
-     * -    'recursive'      (boolean) - whether to search recursively, among all decendents and their children. default is false. This option only works when 'descendantOnly' is true
-     * -    'logicalFile'    (boolean) - whether to return logical file, instead of all replicas for each file. if true, the resource name for each file will be null, instead, num_replicas will be provided. default is false.
-     * -    'smtime'         (int)     - start last-modified-time in unix timestamp. The specified time is included in query, in other words the search can be thought was "mtime >= specified time"
-     * -    'emtime'         (int)     - end last-modified-time in unix timestamp. The specified time is not included in query, in other words the search can be thought was "mtime < specified time"
-     * -    'owner'          (string)  - owner name of the file
-     * -    'rescname'       (string)  - resource name of the file
-     * -    'metadata' (array of RODSMeta) - array of metadata.
-     * @param int &$total_count This value (passed by reference) returns the total potential count of search results
-     * @param int $start starting index of search results.
-     * @param int $limit up to how many results to be returned. If negative, give all results back.
-     * @param array $sort_flds associative array with following keys:
-     * -     'name'      - name of the file or dir
-     * -     'size'      - size of the file
-     * -     'mtime'     - last modified time
-     * -     'ctime'     - creation time
-     * -     'owner'     - owner of the file
-     * -     'typename'  - file/data type
-     * -     'dirname'   - directory/collection name for the file
-     * The results are sorted by specified array keys.
-     * The possible array value must be boolean: true stands for 'asc' and false stands for 'desc', default is 'asc'
-     * @return array of ProdsPath objects (ProdsFile or ProdsDir).
-     */
-    //public function findFiles(array $terms, &$total_count, $start=0, $limit=-1, array $sort_flds=array())
-    public function findFiles(array $terms, &$total_count, $start = 0, $limit = -1,
-                              array $sort_flds = array(),
-                              $get_cb = array('RODSConnManager', 'getConn'),
-                              $rel_cb = array('RODSConnManager', 'releaseConn'))
-    {
-        $flds = array("COL_DATA_NAME" => NULL, "COL_D_DATA_ID" => NULL,
-            "COL_DATA_TYPE_NAME" => NULL, "COL_D_RESC_NAME" => NULL,
-            "COL_DATA_SIZE" => NULL, "COL_D_OWNER_NAME" => NULL, "COL_D_OWNER_ZONE" => NULL,
-            "COL_D_CREATE_TIME" => NULL, "COL_D_MODIFY_TIME" => NULL,
-            "COL_COLL_NAME" => NULL, "COL_D_COMMENTS" => NULL);
-
-        foreach ($sort_flds as $sort_fld_key => $sort_fld_val) {
-            switch ($sort_fld_key) {
-                case 'name':
-                    if ($sort_fld_val === false)
-                        $flds['COL_DATA_NAME'] = 'order_by_desc';
-                    else
-                        $flds['COL_DATA_NAME'] = 'order_by_asc';
-                    break;
-
-                case 'size':
-                    if ($sort_fld_val === false)
-                        $flds['COL_DATA_SIZE'] = 'order_by_desc';
-                    else
-                        $flds['COL_DATA_SIZE'] = 'order_by_asc';
-                    break;
-
-                case 'mtime':
-                    if ($sort_fld_val === false)
-                        $flds['COL_D_MODIFY_TIME'] = 'order_by_desc';
-                    else
-                        $flds['COL_D_MODIFY_TIME'] = 'order_by_asc';
-                    break;
-
-                case 'ctime':
-                    if ($sort_fld_val === false)
-                        $flds['COL_D_CREATE_TIME'] = 'order_by_desc';
-                    else
-                        $flds['COL_D_CREATE_TIME'] = 'order_by_asc';
-                    break;
-
-                case 'typename':
-                    if ($sort_fld_val === false)
-                        $flds['COL_DATA_TYPE_NAME'] = 'order_by_desc';
-                    else
-                        $flds['COL_DATA_TYPE_NAME'] = 'order_by_asc';
-                    break;
-
-                case 'owner':
-                    if ($sort_fld_val === false)
-                        $flds['COL_D_OWNER_NAME'] = 'order_by_desc';
-                    else
-                        $flds['COL_D_OWNER_NAME'] = 'order_by_asc';
-                    break;
-
-                case 'dirname':
-                    if ($sort_fld_val === false)
-                        $flds['COL_COLL_NAME'] = 'order_by_desc';
-                    else
-                        $flds['COL_COLL_NAME'] = 'order_by_asc';
-                    break;
-
-                default:
-                    /*
-                    throw new RODSException("Sort field name '$sort_fld_key' is not valid",
-                      'PERR_USER_INPUT_ERROR');
-                    break;
-                    */
-            }
-        }
-        $select = new RODSGenQueSelFlds(array_keys($flds), array_values($flds));
-
-        $descendantOnly = false;
-        $recursive = false;
-        $logicalFile = false;
-        $condition = new RODSGenQueConds();
-        foreach ($terms as $term_key => $term_val) {
-            switch ($term_key) {
-                case 'name':
-                    //$condition->add('COL_DATA_NAME', 'like', '%'.$term_val.'%');
-                    $condition->add('COL_DATA_NAME', 'like', $term_val);
-                    break;
-                case 'smtime':
-                    $condition->add('COL_D_MODIFY_TIME', '>=', $term_val);
-                    break;
-                case 'emtime':
-                    $condition->add('COL_D_MODIFY_TIME', '<', $term_val);
-                    break;
-                case 'owner':
-                    $condition->add('COL_D_OWNER_NAME', '=', $term_val);
-                    break;
-                case 'ownerzone':
-                    $condition->add('COL_D_OWNER_ZONE', '=', $term_val);
-                    break;
-                case 'rescname':
-                    $condition->add('COL_D_RESC_NAME', '=', $term_val);
-                    break;
-                case 'metadata':
-                    $meta_array = $term_val;
-                    foreach ($meta_array as $meta) {
-                        if (isset($meta->name)) {
-                            if ($meta->nameop === 'like') {
-                                $condition->add('COL_META_DATA_ATTR_NAME', 'like', '%' . $meta->name . '%');
-                            } else if (isset($meta->nameop)) {
-                                $condition->add('COL_META_DATA_ATTR_NAME', $meta->nameop, $meta->name);
-                            } else {
-                                $condition->add('COL_META_DATA_ATTR_NAME', '=', $meta->name);
-                            }
-                        }
-                        if (isset($meta->value)) {
-                            if ($meta->op === 'like') {
-                                $condition->add('COL_META_DATA_ATTR_VALUE', 'like', '%' . $meta->value . '%');
-                            } else if (isset($meta->op)) {
-                                $condition->add('COL_META_DATA_ATTR_VALUE', $meta->op, $meta->value);
-                            } else {
-                                $condition->add('COL_META_DATA_ATTR_VALUE', '=', $meta->value);
-                            }
-                        }
-                        if (isset($meta->unit)) {
-                            if ($meta->unitop === 'like') {
-                                $condition->add('COL_META_DATA_ATTR_UNIT', 'like', '%' . $meta->unit . '%');
-                            } else if (isset($meta->unitop)) {
-                                $condition->add('COL_META_DATA_ATTR_UNIT', $meta->unitop, $meta->unit);
-                            } else {
-                                $condition->add('COL_META_DATA_ATTR_UNIT', '=', $meta->unit);
-                            }
-                        }
-                    }
-                    break;
-
-                case 'descendantOnly':
-                    if (true === $term_val)
-                        $descendantOnly = true;
-                    break;
-
-                case 'recursive':
-                    if (true === $term_val)
-                        $recursive = true;
-                    break;
-
-                case 'logicalFile':
-                    if (true === $term_val)
-                        $logicalFile = true;
-                    break;
-
-                default:
-                    throw new RODSException("Term field name '$term_key' is not valid",
-                        'PERR_USER_INPUT_ERROR');
-                    break;
-            }
-        }
-
-        if ($descendantOnly === true) {
-            if ($recursive === true)
-                $condition->add('COL_COLL_NAME', 'like', $this->path_str . '/%',
-                    array(array('op' => '=', 'val' => $this->path_str)));
-            else
-                $condition->add('COL_COLL_NAME', '=', $this->path_str);
-        }
-
-        if ($logicalFile === true) {
-            $select->update('COL_D_RESC_NAME', 'count');
-            $select->update('COL_DATA_SIZE', 'max');
-            $select->update('COL_D_CREATE_TIME', 'min');
-            $select->update('COL_D_MODIFY_TIME', 'max');
-        }
-
-        //$conn = RODSConnManager::getConn($this->account);
-        $conn = call_user_func_array($get_cb, array(&$this->account));
-        $results = $conn->query($select, $condition, $start, $limit);
-        //RODSConnManager::releaseConn($conn);
-        call_user_func($rel_cb, $conn);
-
-        $total_count = $results->getTotalCount();
-        $result_values = $results->getValues();
-        $found = array();
-        for ($i = 0; $i < $results->getNumRow(); $i++) {
-            $resc_name = ($logicalFile === true) ? NULL : $result_values['COL_D_RESC_NAME'][$i];
-            $num_replica = ($logicalFile === true) ? intval($result_values['COL_D_RESC_NAME'][$i]) : NULL;
-            $stats = new RODSFileStats(
-                $result_values['COL_DATA_NAME'][$i],
-                $result_values['COL_DATA_SIZE'][$i],
-                $result_values['COL_D_OWNER_NAME'][$i],
-                $result_values['COL_D_OWNER_ZONE'][$i],
-                $result_values['COL_D_MODIFY_TIME'][$i],
-                $result_values['COL_D_CREATE_TIME'][$i],
-                $result_values['COL_D_DATA_ID'][$i],
-                $result_values['COL_DATA_TYPE_NAME'][$i],
-                $resc_name,
-                $result_values['COL_D_COMMENTS'][$i],
-                $num_replica
-            );
-
-            if ($result_values['COL_COLL_NAME'][$i] == '/')
-                $full_path = '/' . $result_values['COL_DATA_NAME'][$i];
-            else
-                $full_path = $result_values['COL_COLL_NAME'][$i] . '/' .
-                    $result_values['COL_DATA_NAME'][$i];
-            $found[] = new ProdsFile($this->account, $full_path, false, $stats);
-        }
-        return $found;
-    }
-
-    /**
-     * query metadata, and find matching diretories.
-     * @param array $terms an assositive array of search conditions, supported ones are:
-     * -    'name' (string) - partial name of the target (file or dir)
-     * -    'descendantOnly' (boolean) - whether to search among this directory's decendents. default is false.
-     * -    'recursive'      (boolean) - whether to search recursively, among all decendents and their children. default is false. This option only works when 'descendantOnly' is true
-     * -    'smtime'         (int)     - start last-modified-time in unix timestamp. The specified time is included in query, in other words the search can be thought was "mtime >= specified time"
-     * -    'emtime'         (int)     - end last-modified-time in unix timestamp. The specified time is not included in query, in other words the search can be thought was "mtime < specified time"
-     * -    'owner'          (string)  - owner name of the dir
-     * -    'metadata' (array of RODSMeta) - array of metadata.
-     * @param int &$total_count This value (passed by reference) returns the total potential count of search results
-     * @param int $start starting index of search results.
-     * @param int $limit up to how many results to be returned. If negative, give all results back.
-     * @param array $sort_flds associative array with following keys:
-     * -     'name'      - name of the dir
-     * -     'mtime'     - last modified time
-     * -     'ctime'     - creation time
-     * -     'owner'     - owner of the dir
-     * The results are sorted by specified array keys.
-     * The possible array value must be boolean: true stands for 'asc' and false stands for 'desc', default is 'asc'
-     * @return array of ProdsPath objects (ProdsFile or ProdsDir).
-     */
-    public function findDirs(array $terms, &$total_count, $start = 0, $limit = -1,
-                             array $sort_flds = array())
-    {
-        $flds = array("COL_COLL_NAME" => NULL, "COL_COLL_ID" => NULL,
-            "COL_COLL_OWNER_NAME" => NULL, 'COL_COLL_OWNER_ZONE' => NULL,
-            "COL_COLL_CREATE_TIME" => NULL, "COL_COLL_MODIFY_TIME" => NULL,
-            "COL_COLL_COMMENTS" => NULL);
-
-        foreach ($sort_flds as $sort_fld_key => $sort_fld_val) {
-            switch ($sort_fld_key) {
-                case 'name':
-                    if ($sort_fld_val === false)
-                        $flds['COL_COLL_NAME'] = 'order_by_desc';
-                    else
-                        $flds['COL_COLL_NAME'] = 'order_by_asc';
-                    break;
-
-                case 'mtime':
-                    if ($sort_fld_val === false)
-                        $flds['COL_COLL_MODIFY_TIME'] = 'order_by_desc';
-                    else
-                        $flds['COL_COLL_MODIFY_TIME'] = 'order_by_asc';
-                    break;
-
-                case 'ctime':
-                    if ($sort_fld_val === false)
-                        $flds['COL_COLL_CREATE_TIME'] = 'order_by_desc';
-                    else
-                        $flds['COL_COLL_CREATE_TIME'] = 'order_by_asc';
-                    break;
-
-                case 'owner':
-                    if ($sort_fld_val === false)
-                        $flds['COL_COLL_OWNER_NAME'] = 'order_by_desc';
-                    else
-                        $flds['COL_COLL_OWNER_NAME'] = 'order_by_asc';
-                    break;
-
-                default:
-                    /*
-                    throw new RODSException("Sort field name '$sort_fld_key' is not valid",
-                      'PERR_USER_INPUT_ERROR');
-                    */
-                    break;
-            }
-        }
-        $select = new RODSGenQueSelFlds(array_keys($flds), array_values($flds));
-
-        $descendantOnly = false;
-        $recursive = false;
-        $condition = new RODSGenQueConds();
-        foreach ($terms as $term_key => $term_val) {
-            switch ($term_key) {
-                case 'name':
-                    //$condition->add('COL_COLL_NAME', 'like', '%'.$term_val.'%');
-                    $condition->add('COL_COLL_NAME', 'like', $term_val);
-                    break;
-                case 'smtime':
-                    $condition->add('COL_COLL_MODIFY_TIME', '>=', $term_val);
-                    break;
-                case 'emtime':
-                    $condition->add('COL_COLL_MODIFY_TIME', '<', $term_val);
-                    break;
-                case 'owner':
-                    $condition->add('COL_COLL_OWNER_NAME', '=', $term_val);
-                    break;
-                case 'metadata':
-                    $meta_array = $term_val;
-                    foreach ($meta_array as $meta) {
-                        $condition->add('COL_META_COLL_ATTR_NAME', '=', $meta->name);
-                        if (isset($meta->op))
-                            $op = $meta->op;
-                        else
-                            $op = '=';
-                        if ($op == 'like')
-                            //$value='%'.$meta->value.'%';
-                            $value = $meta->value;
-                        else
-                            $value = $meta->value;
-                        $condition->add('COL_META_COLL_ATTR_VALUE', $op, $value);
-                    }
-                    break;
-
-                case 'descendantOnly':
-                    if (true === $term_val)
-                        $descendantOnly = true;
-                    break;
-
-                case 'recursive':
-                    if (true === $term_val)
-                        $recursive = true;
-                    break;
-
-                default:
-                    throw new RODSException("Term field name '$term_key' is not valid",
-                        'PERR_USER_INPUT_ERROR');
-                    break;
-            }
-        }
-
-        if ($descendantOnly === true) {
-            // eliminate '/' from children, if current path is already root
-            if ($this->path_str == '/')
-                $condition->add('COL_COLL_NAME', '<>', '/');
-
-            if ($recursive === true)
-                $condition->add('COL_COLL_PARENT_NAME', 'like', $this->path_str . '/%',
-                    array(array('op' => '=', 'val' => $this->path_str)));
-            else
-                $condition->add('COL_COLL_PARENT_NAME', '=', $this->path_str);
-        }
-
-        $conn = RODSConnManager::getConn($this->account);
-        $results = $conn->query($select, $condition, $start, $limit);
-        RODSConnManager::releaseConn($conn);
-
-        $total_count = $results->getTotalCount();
-        $result_values = $results->getValues();
-        $found = array();
-        for ($i = 0; $i < $results->getNumRow(); $i++) {
-            $full_path = $result_values['COL_COLL_NAME'][$i];
-            $acctual_name = basename($result_values['COL_COLL_NAME'][$i]);
-            $stats = new RODSDirStats(
-                $acctual_name,
-                $result_values['COL_COLL_OWNER_NAME'][$i],
-                $result_values['COL_COLL_OWNER_ZONE'][$i],
-                $result_values['COL_COLL_MODIFY_TIME'][$i],
-                $result_values['COL_COLL_CREATE_TIME'][$i],
-                $result_values['COL_COLL_ID'][$i],
-                $result_values['COL_COLL_COMMENTS'][$i]);
-
-            $found[] = new ProdsDir($this->account, $full_path, false, $stats);
-        }
-        return $found;
-    }
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsFile.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsFile.class.php
deleted file mode 100644
index 3fa5da0dcc..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsFile.class.php
+++ /dev/null
@@ -1,434 +0,0 @@
-<?php
-/**
- * PRODS file class
- * @author Sifang Lu <sifang@sdsc.edu>
- * @copyright Copyright &copy; 2007, TBD
- * @package Prods
- */
-
-require_once("autoload.inc.php");
-
-class ProdsFile extends ProdsPath
-{
-    public $stats;
-
-    private $rodsconn; //real RODS connection
-    private $l1desc; //lvl 1 descriptor on RODS server
-    private $conn; //the connection to RODS agent l1desc lives on.
-    private $rescname; //resource name.
-    private $openmode; //open mode used if file is opened
-    private $position; //current position of the file, if opened.
-
-    /**
-     * The class constructor
-     */
-    public function __construct(RODSAccount &$account, $path_str,
-                                $verify = false, RODSFileStats $stats = NULL)
-    {
-        $this->l1desc = -1;
-        $this->stats = $stats;
-
-        if ($path_str{strlen($path_str) - 1} == '/') {
-            throw new RODSException("Invalid file name '$path_str' ",
-                'PERR_USER_INPUT_PATH_ERROR');
-        }
-
-        parent::__construct($account, $path_str);
-        if ($verify === true) {
-            if ($this->exists() === false) {
-                throw new RODSException("File '$this' does not exist",
-                    'PERR_PATH_DOES_NOT_EXISTS');
-            }
-        }
-    }
-  
-  
- /**
-	* Create a new ProdsFile object from URI string.
-	* @param string $path the URI Sting
-	* @param boolean $verify whether verify if the path exsits
-	* @return a new ProdsDir
-	*/
-  public static function fromURI($path, $verify=false)
-  {
-    if (0!=strncmp($path,"rods://",7))
-      $path="rods://".$path;
-    $url=parse_url($path);
-    
-    $host=isset($url['host'])?$url['host']:''; 
-    $port=isset($url['port'])?$url['port']:'';   
-    
-    $user='';
-    $zone='';
-    $authtype='irods';
-    if (isset($url['user']))
-    {
-      if (strstr($url['user'],".")!==false) {
-        $user_array=@explode(".",$url['user']);
-        if (count($user_array)===3) {
-          $user=$user_array[0];
-          $zone=$user_array[1];
-          $authtype=$user_array[2];
-        }
-        else {
-          $user=$user_array[0];
-          $zone=$user_array[1];
-        }
-      }
-      else
-        $user=$url['user'];
-    }  
-    
-    $pass=isset($url['pass'])?$url['pass']:'';
-    
-    $account=new RODSAccount($host, $port, $user, $pass, $zone, '', $authtype);
-    
-    $path_str=isset($url['path'])?$url['path']:''; 
-    
-    // treat query and fragment as part of name
-    if (isset($url['query'])&&(strlen($url['query'])>0))
-      $path_str=$path_str.'?'.$url['query'];
-    if (isset($url['fragment'])&&(strlen($url['fragment'])>0))
-      $path_str=$path_str.'#'.$url['fragment'];
-    
-    if (empty($path_str))
-      $path_str='/'; 
-      
-    return (new ProdsFile($account,$path_str,$verify));
-  }  
-  
- /**
-	* Verify if this file exist with server. This function shouldn't be called directly, use {@link exists}
-	*/
-  protected function verify()
-  {
-    $conn = RODSConnManager::getConn($this->account);
-    $this->path_exists= $conn -> fileExists ($this->path_str);
-    RODSConnManager::releaseConn($conn);  
-  }
-  
- /**
-  * get the file stats
-  */
-  public function getStats()
-  {
-    $conn = RODSConnManager::getConn($this->account);
-    $stats=$conn->getFileStats($this->path_str);
-    RODSConnManager::releaseConn($conn); 
-    
-    if ($stats===false) $this->stats=NULL;
-    else $this->stats=$stats;
-    return $this->stats;
-  }
- 
-    /**
-     * Open a file path (string) exists on RODS server.
-     *
-     * @param string $mode open mode. Supported modes are:
-     * -  'r'     Open for reading only; place the file pointer at the beginning of the file.
-     * -  'r+'    Open for reading and writing; place the file pointer at the beginning of the file.
-     * -  'w'    Open for writing only; place the file pointer at the beginning of the file and truncate the file to zero length. If the file does not exist, attempt to create it.
-     * -  'w+'    Open for reading and writing; place the file pointer at the beginning of the file and truncate the file to zero length. If the file does not exist, attempt to create it.
-     * -  'a'    Open for writing only; place the file pointer at the end of the file. If the file does not exist, attempt to create it.
-     * -  'a+'    Open for reading and writing; place the file pointer at the end of the file. If the file does not exist, attempt to create it.
-     * -  'x'    Create and open for writing only; place the file pointer at the beginning of the file. If the file already exists, the fopen() call will fail by returning FALSE and generating an error of level E_WARNING. If the file does not exist, attempt to create it. This is equivalent to specifying O_EXCL|O_CREAT flags for the underlying open(2) system call.
-     * -  'x+'    Create and open for reading and writing; place the file pointer at the beginning of the file. If the file already exists, the fopen() call will fail by returning FALSE and generating an error of level E_WARNING. If the file does not exist, attempt to create it. This is equivalent to specifying O_EXCL|O_CREAT flags for the underlying open(2) system call.
-     * @param string $rescname. Note that this parameter is required only if the file does not exists (create mode). If the file already exists, and if file resource is unknown or unique or you-dont-care for that file, leave the field, or pass NULL.
-     * @param boolean $assum_file_exists. This parameter specifies whether file exists. If the value is false, this mothod will check with RODS server to make sure. If value is true, the check will NOT be done. Default value is false.
-     * @param string $filetype. This parameter only make sense when you want to specify the file type, if file does not exists (create mode). If not specified, it defaults to "generic"
-     * @param integer $cmode. This parameter is only used for "createmode". It specifies the file mode on physical storage system (RODS vault), in octal 4 digit format. For instance, 0644 is owner readable/writeable, and nothing else. 0777 is all readable, writable, and excutable. If not specified, and the open flag requirs create mode, it defaults to 0644.
-     */
-    public function open($mode, $rescname = NULL,
-                         $assum_file_exists = false, $filetype = 'generic', $cmode = 0644)
-    {
-        if ($this->l1desc >= 0)
-            return;
-
-        if (!empty($rescname))
-            $this->rescname = $rescname;
-
-        $this->conn = RODSConnManager::getConn($this->account);
-        $this->l1desc = $this->conn->openFileDesc($this->path_str, $mode,
-            $this->postion, $rescname, $assum_file_exists, $filetype, $cmode);
-        $this->openmode = $mode;
-        RODSConnManager::releaseConn($this->conn);
-    }
-
-    /**
-     * get the file open mode, if opened previously
-     * @return string open mode, if not opened, it return NULL
-     */
-    public function getOpenmode()
-    {
-        return $this->openmode;
-    }
-
-    /**
-     * get the file current position, if opened previously
-     * @return string open mode, if not opened, it return NULL
-     */
-    public function tell()
-    {
-        return $this->position;
-    }
-
-    /**
-     * unlink the file on server
-     * @param string $rescname resource name. Not required if there is no other replica.
-     * @param boolean $force flag (true or false) indicating whether force delete or not.
-     */
-    public function unlink($rescname = NULL, $force = false)
-    {
-        $conn = RODSConnManager::getConn($this->account);
-        $conn->fileUnlink($this->path_str, $rescname, $force);
-        RODSConnManager::releaseConn($conn);
-    }
-    /**
-     * close the file descriptor (private) made from RODS server earlier.
-     */
-    public function close()
-    {
-        if ($this->l1desc >= 0) {
-            while ($this->conn->isIdle() === false) {
-                trigger_error("The connection is not available! sleep for a while and retry...",
-                    E_USER_WARNING);
-                usleep(50);
-            }
-            $this->conn->lock();
-            $this->conn->closeFileDesc($this->l1desc);
-            $this->conn->unlock();
-            $this->conn = null; //release the connection
-            $this->l1desc = -1;
-        }
-    }
-
-    /**
-     * reads up to length bytes from the file. Reading stops when up to length bytes have been read, EOF (end of file) is reached
-     *
-     * @param int $length up to how many bytes to read.
-     * @return the read string.
-     */
-    public function read($length)
-    {
-        if ($this->l1desc < 0) {
-            throw new RODSException("File '$this' is not opened! l1desc=$this->l1desc",
-                'PERR_USER_INPUT_ERROR');
-        }
-
-        while ($this->conn->isIdle() === false) {
-            trigger_error("The connection is not available! sleep for a while and retry...",
-                E_USER_WARNING);
-            usleep(50);
-        }
-
-        $this->conn->lock();
-        $retval = $this->conn->fileRead($this->l1desc, $length);
-        $this->position = $this->position + strlen($retval);
-        $this->conn->unlock();
-        return $retval;
-    }
-
-    /**
-     * write up to length bytes to the server. this function is binary safe.
-     * @param string $string contents to be written.
-     * @param int $length up to how many bytes to write.
-     * @return the number of bytes written.
-     */
-    public function write($string, $length = NULL)
-    {
-        if ($this->l1desc < 0) {
-            throw new RODSException("File '$this' is not opened! l1desc=$this->l1desc",
-                'PERR_USER_INPUT_ERROR');
-        }
-
-        while ($this->conn->isIdle() === false) {
-            trigger_error("The connection is not available! sleep for a while and retry...",
-                E_USER_WARNING);
-            usleep(50);
-        }
-
-        $this->conn->lock();
-        $retval = $this->conn->fileWrite($this->l1desc, $string, $length);
-        $this->position = $this->position + (int)$retval;
-        $this->conn->unlock();
-        return $retval;
-    }
-
-    /**
-     *  Sets the file position for the file. The new position, measured in bytes from the beginning of the file, is obtained by adding offset to the position specified by whence, whose values are defined as follows:
-     *  SEEK_SET - Set position equal to offset bytes.
-     *  SEEK_CUR - Set position to current location plus offset.
-     *  SEEK_END - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.)
-     *  If whence is not specified, it is assumed to be SEEK_SET.
-     * @return int the current offset
-     */
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        if ($this->l1desc < 0) {
-            throw new RODSException("File '$this' is not opened! l1desc=$this->l1desc",
-                'PERR_USER_INPUT_ERROR');
-        }
-
-        while ($this->conn->isIdle() === false) {
-            trigger_error("The connection is not available! sleep for a while and retry...",
-                E_USER_WARNING);
-            usleep(50);
-        }
-
-        $this->conn->lock();
-        $retval = $this->conn->fileSeek($this->l1desc, $offset, $whence);
-        $this->position = (int)$retval;
-        $this->conn->unlock();
-        return $retval;
-    }
-
-    /**
-     * Sets the file position to the beginning of the file stream.
-     */
-    public function rewind()
-    {
-        while ($this->conn->isIdle() === false) {
-            trigger_error("The connection is not available! sleep for a while and retry...",
-                E_USER_WARNING);
-            usleep(50);
-        }
-
-        $this->seek(0, SEEK_SET);
-        $this->position = 0;
-    }
-
-    /**
-     * get the file descriptor (private) made from RODS server earlier.
-     */
-    public function getL1desc()
-    {
-        return $this->l1desc;
-    }
-
-    /**
-     * Because RODS server can only do file operations in a single connection, a RODS
-     * connection is 'reserved' when file is opened, and released when closed.
-     */
-    public function getConn()
-    {
-        return $this->conn;
-    }
-
-    /**
-     * Replicate file to resources with options.
-     * @param string $desc_resc destination resource
-     * @param array $options an assosive array of options:
-     *   - 'all'        (boolean): only meaningful if input resource is a resource group. Replicate to all the resources in the resource group.
-     *   - 'backupMode' (boolean): if a good copy already exists in this resource, don't make another copy.
-     *   - 'admin'      (boolean): admin user uses this option to backup/replicate other users files
-     *   - 'replNum'    (integer): the replica to copy, typically not needed
-     *   - 'srcResc'    (string): specifies the source resource of the data object to be replicate, only copies stored in this resource will be replicated. Otherwise, one of the copy will be replicated
-     * These options are all 'optional', if omitted, the server will try to do it anyway
-     * @return number of bytes written if success, in case of faliure, throw an exception
-     */
-    public function repl($desc_resc, array $options = array())
-    {
-        $conn = RODSConnManager::getConn($this->account);
-        $bytesWritten = $conn->repl($this->path_str, $desc_resc, $options);
-        RODSConnManager::releaseConn($conn);
-
-        return $bytesWritten;
-    }
-
-    /**
-     * get replica information for this file
-     * @return array of array, each child array is a associative and contains:
-     *   [repl_num]      : replica number
-     *   [chk_sum]       : checksum of the file
-     *   [size]          : size of the file (replica)
-     *   [resc_name]     : resource name
-     *   [resc_repl_status] : replica status (dirty bit), whether this replica is dirty (modifed), and requirs synchs to other replicas.
-     *   [resc_grp_name] : resource group name
-     *   [resc_type]     : resource type name
-     *   [resc_class]    : resource class name
-     *   [resc_loc]      : resource location
-     *   [resc_freespace]: resource freespace
-     *   [data_status]   : data status
-     *   [ctime]         : data creation time (unix timestamp)
-     *   [mtime]         : data last modified time (unix timestamp)
-     */
-    public function getReplInfo()
-    {
-        $select = new RODSGenQueSelFlds(
-            array("COL_DATA_REPL_NUM", "COL_D_DATA_CHECKSUM", 'COL_DATA_SIZE',
-                "COL_D_RESC_NAME", "COL_D_RESC_GROUP_NAME",
-                "COL_D_DATA_STATUS", "COL_D_CREATE_TIME",
-                "COL_D_MODIFY_TIME", 'COL_R_TYPE_NAME', 'COL_R_CLASS_NAME',
-                'COL_R_LOC', 'COL_R_FREE_SPACE', 'COL_D_REPL_STATUS')
-        );
-        $condition = new RODSGenQueConds(
-            array("COL_COLL_NAME", "COL_DATA_NAME"),
-            array("=", "="),
-            array($this->parent_path, $this->name)
-        );
-
-        $conn = RODSConnManager::getConn($this->account);
-        $que_result = $conn->query($select, $condition);
-        RODSConnManager::releaseConn($conn);
-
-        $ret_arr = array();
-        for ($i = 0; $i < $que_result->getNumRow(); $i++) {
-            $ret_arr_row = array();
-            $que_result_val = $que_result->getValues();
-            $ret_arr_row['repl_num'] = $que_result_val['COL_DATA_REPL_NUM'][$i];
-            $ret_arr_row['chk_sum'] = $que_result_val['COL_D_DATA_CHECKSUM'][$i];
-            $ret_arr_row['size'] = $que_result_val['COL_DATA_SIZE'][$i];
-            $ret_arr_row['resc_name'] = $que_result_val['COL_D_RESC_NAME'][$i];
-            $ret_arr_row['resc_grp_name'] = $que_result_val['COL_D_RESC_GROUP_NAME'][$i];
-            $ret_arr_row['data_status'] = $que_result_val['COL_D_DATA_STATUS'][$i];
-            $ret_arr_row['ctime'] = $que_result_val['COL_D_CREATE_TIME'][$i];
-            $ret_arr_row['mtime'] = $que_result_val['COL_D_MODIFY_TIME'][$i];
-            $ret_arr_row['resc_type'] = $que_result_val['COL_R_TYPE_NAME'][$i];
-            $ret_arr_row['resc_class'] = $que_result_val['COL_R_CLASS_NAME'][$i];
-            $ret_arr_row['resc_loc'] = $que_result_val['COL_R_LOC'][$i];
-            $ret_arr_row['resc_freespace'] = $que_result_val['COL_R_FREE_SPACE'][$i];
-            $ret_arr_row['resc_repl_status'] = $que_result_val['COL_D_REPL_STATUS'][$i];
-            $ret_arr[] = $ret_arr_row;
-        }
-        return $ret_arr;
-    }
-    
-        /**
-     * Get ACL (users and their rights on a file)
-     * @param string $filepath input file path string
-     * @return RODSFileStats. If file does not exists, return fales.
-     */
-    public function getACL()
-    {
-
-        $filepath = $this->path_str;
-        $parent = dirname($filepath);
-        $filename = basename($filepath);
-
-//        $cond = array(new RODSQueryCondition("COL_COLL_NAME", $parent),
-//            new RODSQueryCondition("COL_DATA_NAME", $filename));
-        $cond = array(new RODSQueryCondition("COL_DATA_NAME", $filename),
-            new RODSQueryCondition("COL_COLL_NAME", $parent));
-
-        $connLocal = RODSConnManager::getConn($this->account);
-        $que_result = $connLocal->genQuery(
-              array("COL_USER_NAME", "COL_USER_ZONE", "COL_DATA_ACCESS_NAME"),
-            $cond, array());
-        RODSConnManager::releaseConn($connLocal);
-        if ($que_result === false) return false;
-
-
-        for($i=0; $i < sizeof($que_result['COL_USER_NAME']); $i++) {
-            $users[] = (object) array(
-                "COL_USER_NAME" => $que_result['COL_USER_NAME'][$i],
-                "COL_USER_ZONE" => $que_result['COL_USER_ZONE'][$i],
-                "COL_DATA_ACCESS_NAME" => $que_result['COL_DATA_ACCESS_NAME'][$i]
-            );
-        }
-        return $users;
-    }
-}   
-    
-    
-    
-    
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php
deleted file mode 100644
index fdf100b77a..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-/**
- * ProdsPath class file.
- * @author Sifang Lu <sifang@sdsc.edu>
- * @copyright Copyright &copy; 2007, TBD
- * @package Prods
- */
-
-require_once("autoload.inc.php");
-
-require_once(CLASS_DIR . "/ProdsConfig.inc.php");
-
-/**
- * ProdsPath class. This class is a abastract class for objects that can be represented as a path, such as file or directory
- * @package Prods
- */
-abstract class ProdsPath
-{
-    /**
-     * string path
-     * @var string
-     */
-    public $path_str;
-
-    public $account;
-
-    protected $path_exists;
-
-    protected $parent_path;
-    protected $name;
-
-    /**
-     * Default Constructor. Because this class is abstract, this constructor should not be called directly.
-     *
-     * @param RODSAccount account iRODS account used for connection
-     * @param string $path_str the path of this dir
-     * @return ProdsPath a new ProdsPath
-     */
-    public function __construct(RODSAccount &$account, $path_str)
-    {
-        $this->account = $account;
-
-        // strip the tailing "/"
-        while ((strlen($path_str) > 1) && ($path_str{strlen($path_str) - 1} == '/')) {
-            $path_str = substr($path_str, 0, strlen($path_str) - 1);
-        }
-        // remove duplicate '/' characters
-        $path_str = str_replace('//', '/', $path_str);
-        $this->path_str = $path_str;
-        if ($path_str == '/') {
-            $this->parent_path = null;
-        } else {
-            $this->parent_path = dirname($this->path_str);
-        }
-        $this->name = basename($this->path_str);
-    }
-
-    public function __toString()
-    {
-        return $this->account . $this->path_str;
-    }
-
-    /**
-     * Whether this path (dir or file) exists on the server.
-     * @return boolean
-     */
-    public function exists()
-    {
-        if (isset($this->path_exists))
-            return $this->path_exists;
-
-        else {
-            $this->verify();
-            return $this->path_exists;
-        }
-    }
-
-    /**
-     * Verify if a path exist with server. This function shouldn't be called directly, use {@link exists}
-     */
-    abstract protected function verify();
-
-    /**
-     * Get meta data of this path (file or dir).
-     * @return array array of RODSMeta.
-     */
-    //public function getMeta()
-    public function getMeta($get_cb = array('RODSConnManager', 'getConn'),
-                            $rel_cb = array('RODSConnManager', 'releaseConn'))
-    {
-        if ($this instanceof ProdsFile)
-            $type = 'd';
-        else
-            if ($this instanceof ProdsDir)
-                $type = 'c';
-            else
-                throw new RODSException("Unsupported data type:" . get_class($this),
-                    "PERR_INTERNAL_ERR");
-        //$conn = RODSConnManager::getConn($this->account);
-        $conn = call_user_func_array($get_cb, array(&$this->account));
-        $meta_array = $conn->getMeta($type, $this->path_str);
-        //RODSConnManager::releaseConn($conn);
-        call_user_func($rel_cb, $conn);
-        return $meta_array;
-    }
-
-    /**
-     * update metadata to this path (file or dir)
-     */
-    public function updateMeta(RODSMeta $meta_old, RODSMeta $meta_new)
-    {
-        $this->rmMeta($meta_old);
-        $this->addMeta($meta_new);
-    }
-
-    /**
-     * Add metadata to this path (file or dir)
-     */
-    // public function addMeta(RODSMeta $meta)
-    public function addMeta(RODSMeta $meta,
-                            $get_cb = array('RODSConnManager', 'getConn'),
-                            $rel_cb = array('RODSConnManager', 'releaseConn'))
-    {
-        if ($this instanceof ProdsFile)
-            $type = 'd';
-        else
-            if ($this instanceof ProdsDir)
-                $type = 'c';
-            else
-                throw new RODSException("Unsupported data type:" . get_class($this),
-                    "PERR_INTERNAL_ERR");
-
-        //$conn = RODSConnManager::getConn($this->account);
-        $conn = call_user_func_array($get_cb, array(&$this->account));
-        $conn->addMeta($type, $this->path_str, $meta);
-        //RODSConnManager::releaseConn($conn);
-        call_user_func($rel_cb, $conn);
-    }
-
-    /**
-     * remove metadata to this path (file or dir)
-     */
-    // public function rmMeta(RODSMeta $meta)
-    public function rmMeta(RODSMeta $meta,
-                           $get_cb = array('RODSConnManager', 'getConn'),
-                           $rel_cb = array('RODSConnManager', 'releaseConn'))
-    {
-        if ($this instanceof ProdsFile)
-            $type = 'd';
-        else
-            if ($this instanceof ProdsDir)
-                $type = 'c';
-            else
-                throw new RODSException("Unsupported data type:" . get_class($this),
-                    "PERR_INTERNAL_ERR");
-
-        //$conn = RODSConnManager::getConn($this->account);
-        $conn = call_user_func_array($get_cb, array(&$this->account));
-        $conn->rmMeta($type, $this->path_str, $meta);
-        //RODSConnManager::releaseConn($conn);
-        call_user_func($rel_cb, $conn);
-    }
-
-    /**
-     * remove metadata of this path (file or dir) by id
-     * @param integer metaid id of the metadata entry
-     */
-    // public function rmMetaByID ($metaid)
-    public function rmMetaByID($metaid,
-                               $get_cb = array('RODSConnManager', 'getConn'),
-                               $rel_cb = array('RODSConnManager', 'releaseConn'))
-    {
-        if ($this instanceof ProdsFile)
-            $type = 'd';
-        else
-            if ($this instanceof ProdsDir)
-                $type = 'c';
-            else
-                throw new RODSException("Unsupported data type:" . get_class($this),
-                    "PERR_INTERNAL_ERR");
-
-        //$conn = RODSConnManager::getConn($this->account);
-        $conn = call_user_func_array($get_cb, array(&$this->account));
-        $conn->rmMetaByID($type, $this->path_str, $metaid);
-        //RODSConnManager::releaseConn($conn);
-        call_user_func($rel_cb, $conn);
-    }
-
-    /**
-     * copy meta data from this path (file or dir) to $dest path
-     */
-    // public function cpMeta(ProdsPath $dest)
-    public function cpMeta(ProdsPath $dest,
-                           $get_cb = array('RODSConnManager', 'getConn'),
-                           $rel_cb = array('RODSConnManager', 'releaseConn'))
-    {
-        if ($this instanceof ProdsFile)
-            $type_src = 'd';
-        else
-            if ($this instanceof ProdsDir)
-                $type_src = 'c';
-            else
-                throw new RODSException("Unsupported data type:" . get_class($this),
-                    "PERR_INTERNAL_ERR");
-
-        if ($dest instanceof ProdsFile)
-            $type_dest = 'd';
-        else
-            if ($dest instanceof ProdsDir)
-                $type_dest = 'c';
-            else
-                throw new RODSException("Unsupported data type:" . get_class($this),
-                    "PERR_INTERNAL_ERR");
-
-        //$conn = RODSConnManager::getConn($this->account);
-        $conn = call_user_func_array($get_cb, array(&$this->account));
-        $conn->cpMeta($type_src, $type_dest, $this->path_str, $dest->path_str);
-        //RODSConnManager::releaseConn($conn);
-        call_user_func($rel_cb, $conn);
-    }
-
-    /**
-     * rename this path (file of dir)
-     * @param string $new_path_str new path string to be renamed to.
-     */
-    // public function rename($new_path_str)
-    public function rename($new_path_str,
-                           $get_cb = array('RODSConnManager', 'getConn'),
-                           $rel_cb = array('RODSConnManager', 'releaseConn'))
-    {
-        if ($this instanceof ProdsFile)
-            $type = 0;
-        else
-            $type = 1;
-        //$conn = RODSConnManager::getConn($this->account);
-        $conn = call_user_func_array($get_cb, array(&$this->account));
-        $conn->rename($this->path_str, $new_path_str, $type);
-        //RODSConnManager::releaseConn($conn);
-        call_user_func($rel_cb, $conn);
-        $this->path_str = $new_path_str;
-        $this->parent_path = dirname($this->path_str);
-        $this->name = basename($this->path_str);
-    }
-
-    /**
-     * Get name of this path. note that this is not the full path. for instance if path is "/foo/bar", the name is "bar"
-     * @return string name of the path.
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Get string form of this path. note that this is the full path.
-     * @return string form of the path.
-     */
-    public function getPath()
-    {
-        return $this->path_str;
-    }
-
-    /**
-     * Get parent's path of this path.
-     * @return string parent's path.
-     */
-    public function getParentPath()
-    {
-        return $this->parent_path;
-    }
-
-    /**
-     * Get URI of this path.
-     * @return string this path's URI.
-     */
-    public function toURI()
-    {
-        return $this->account->toURI() . $this->path_str;
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php
deleted file mode 100644
index 5e8dc92d59..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * ProdsQuery class.
- *
- * This class provides high level PRODS queries, which aren't specific
- * to a path, account or resource.
- * @author Sifang Lu <sifang@sdsc.edu>
- * @copyright Copyright &copy; 2007, TBD
- * @package Prods
- */
-require_once("autoload.inc.php");
-
-class ProdsQuery
-{
-    public $account;
-
-    public function __construct(RODSAccount $account)
-    {
-        $this->account = $account;
-    }
-
-    /**
-     * Get all user defined metadata names for all files on the server.
-     * @return array of strings (metadata names).
-     */
-    public function getMetadataNamesForAllFiles()
-    {
-        $flds = array("COL_META_DATA_ATTR_NAME" => NULL);
-        $select = new RODSGenQueSelFlds(array_keys($flds), array_values($flds));
-        $condition = new RODSGenQueConds();
-        $condition->add('COL_D_DATA_ID', '>=', '0');
-        $conn = RODSConnManager::getConn($this->account);
-        $results = $conn->query($select, $condition);
-        RODSConnManager::releaseConn($conn);
-
-        if ($results->getNumRow() < 1)
-            return array();
-        else {
-            $values = $results->getValues();
-            return $values['COL_META_DATA_ATTR_NAME'];
-        }
-    }
-
-    /**
-     * Get all user defined metadata names for all directories(collections) on the server.
-     * @return array of strings (metadata names).
-     */
-    public function getMetadataNamesForAllDirs()
-    {
-        $flds = array("COL_META_COLL_ATTR_NAME" => NULL);
-        $select = new RODSGenQueSelFlds(array_keys($flds), array_values($flds));
-        $condition = new RODSGenQueConds();
-        $condition->add('COL_COLL_ID', '>=', '0');
-        $conn = RODSConnManager::getConn($this->account);
-        $results = $conn->query($select, $condition);
-        RODSConnManager::releaseConn($conn);
-
-        if ($results->getNumRow() < 1)
-            return array();
-        else {
-            $values = $results->getValues();
-            return $values['COL_META_COLL_ATTR_NAME'];
-        }
-    }
-
-    /**
-     * Get all resources registered on the server
-     * @return array with fields: id, name, type, zone, class, loc, info, comment, ctime, mtime, vault_path, free_space. If user not found return empty array.
-     */
-    public function getResources()
-    {
-        // set selected value
-        $flds = array("COL_R_RESC_ID" => NULL, "COL_R_RESC_NAME" => NULL,
-            "COL_R_ZONE_NAME" => NULL, "COL_R_TYPE_NAME" => NULL,
-            "COL_R_CLASS_NAME" => NULL, "COL_R_LOC" => NULL,
-            "COL_R_VAULT_PATH" => NULL, "COL_R_FREE_SPACE" => NULL,
-            "COL_R_RESC_INFO" => NULL, "COL_R_RESC_COMMENT" => NULL,
-            "COL_R_CREATE_TIME" => NULL, "COL_R_MODIFY_TIME" => NULL);
-        $select = new RODSGenQueSelFlds(array_keys($flds), array_values($flds));
-        $condition = new RODSGenQueConds();
-        $conn = RODSConnManager::getConn($this->account);
-        $results = $conn->query($select, $condition);
-        RODSConnManager::releaseConn($conn);
-        $result_vals = $results->getValues();
-        $retval = array();
-        for ($i = 0; $i < $results->getNumRow(); $i++) {
-            $retval_row = array();
-            $retval_row['id'] = $result_vals["COL_R_RESC_ID"][$i];
-            $retval_row['name'] = $result_vals["COL_R_RESC_NAME"][$i];
-            $retval_row['type'] = $result_vals["COL_R_TYPE_NAME"][$i];
-            $retval_row['zone'] = $result_vals["COL_R_ZONE_NAME"][$i];
-            $retval_row['class'] = $result_vals["COL_R_CLASS_NAME"][$i];
-            $retval_row['loc'] = $result_vals["COL_R_LOC"][$i];
-            $retval_row['info'] = $result_vals["COL_R_RESC_INFO"][$i];
-            $retval_row['comment'] = $result_vals["COL_R_RESC_COMMENT"][$i];
-            $retval_row['ctime'] = $result_vals["COL_R_CREATE_TIME"][$i];
-            $retval_row['mtime'] = $result_vals["COL_R_MODIFY_TIME"][$i];
-            $retval_row['vault_path'] = $result_vals["COL_R_VAULT_PATH"][$i];
-            $retval_row['free_space'] = $result_vals["COL_R_FREE_SPACE"][$i];
-            $retval[] = $retval_row;
-        }
-        return $retval;
-
-    }
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php
deleted file mode 100644
index d14d87ad1a..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * ProdsRule class. Provides iRODS rule related functionalities.
- * @author Sifang Lu <sifang@sdsc.edu>
- * @copyright Copyright &copy; 2007, TBD
- * @package Prods
- */
-require_once("autoload.inc.php");
-
-class ProdsRule
-{
-    public $account;
-    public $body;
-    public $inp_params;
-    public $out_params;
-    public $remotesvr;
-    public $options;
-
-    /*
-     * @param RODSAccount account this is the account used to connect to iRODS server
-     * @param string $rule_body body of the rule. Read this tutorial for details about rules: http://www.irods.org/index.php/Executing_user_defined_rules/workflow
-     * @param array $inp_params associative array defining input parameters for micro services used in this rule. only string and keyval pair are supported at this time. If the array value is a string, then type is string, if the array value is an RODSKeyValPair object, it will be treated a keyval pair
-     * @param array $out_params an array of names (strings)
-     * @param array $remotesvr if this rule need to run at remote server, this associative array should have the following keys:
-     *    - 'host' remote host name or address
-     *    - 'port' remote port
-     *    - 'zone' remote zone
-     *    if any of the value is empty, this option will be ignored.
-     * @param RODSKeyValPair $options an RODSKeyValPair specifying additional options, purpose of this is unknown at the developement time. Leave it alone if you are as clueless as me...
-     */
-    public function __construct(RODSAccount $account, $rule_body,
-                                array $inp_params = array(), array $out_params = array(),
-                                array $remotesvr = array(), RODSKeyValPair $options = null)
-    {
-        $this->account = $account;
-        $this->rule_body = $rule_body;
-        $this->inp_params = $inp_params;
-        $this->out_params = $out_params;
-        $this->remotesvr = $remotesvr;
-        if (isset($options))
-            $this->options = $options;
-        else
-            $this->options = new RODSKeyValPair();
-    }
-
-    /**
-     * Excute the rule, assign
-     * @return an associative array. Each array key is the lable, and each array value's type will depend on the type of $out_param, at this moment, only string and RODSKeyValPair are supported
-     */
-    public function execute()
-    {
-        $conn = RODSConnManager::getConn($this->account);
-        $result = $conn->execUserRule($this->rule_body, $this->inp_params,
-            $this->out_params, $this->remotesvr, $this->options = null);
-        RODSConnManager::releaseConn($conn);
-
-        return $result;
-    }
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php
deleted file mode 100644
index 67ef096c5c..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php
+++ /dev/null
@@ -1,434 +0,0 @@
-<?php
-
-/**
- * PRODS class
- * @author Sifang Lu <sifang@sdsc.edu>
- * @copyright Copyright &copy; 2007, TBD
- * @package Prods
- */
-
-require_once("autoload.inc.php");
-
-class ProdsStreamer
-{
- /**
-	* current position of the file or dir
-	*
-	* @access private
-	*/
-  private $position;
-  
-  /**
-	 * Name of the directory/collection specified in the URI to opendir().
-	 *
-	 * @access private
-	 */
-	private $dir;
-	
-	/**
-	 * Name of the file specified in the URI to fopen().
-	 *
-	 * @access private
-	 */
-	private $file;
-
-	
-	/**
-	 * url_stat() handler.
-	 *
-	 * @access private
-	 */
-	public function url_stat($path)
-	{
-		try {
-                  $file=ProdsDir::fromURI($path);
-                  $conn = RODSConnManager::getConn($file->account);
-
-                  $stats = $this->stat_file($conn, $file->path_str);
-                  if (!$stats) {
-                    $stats = $this->stat_dir($conn, $file->path_str);
-                  }
-                  
-                  RODSConnManager::releaseConn($conn);
-                  
-                  return $stats;
-                  
-		} catch (Exception $e) {
-                  trigger_error("Got an exception:$e", E_USER_WARNING);
-                  return false;
-		}
-	}
-
-        /**
-         * @param $conn
-         * @param $file
-         * @return mixed
-         */
-        private function stat_dir($conn, $path_str) {
-                 try {
-                   $irods_stats = $conn->getDirStats($path_str);
-                   if (!$irods_stats)
-                     return false;
-                   $stats = array();
-                   $stats[0] = $stats['dev'] = 0;
-                   $stats[1] = $stats['ino'] = 0;
-                   $stats[2] = $stats['mode'] = octdec('040755');
-                   $stats[3] = $stats['nlink'] = 1;
-                   $stats[4] = $stats['uid'] = 0;
-                   $stats[5] = $stats['gid'] = 0;
-                   $stats[6] = $stats['rdev'] = -1;
-                   $stats[7] = $stats['size'] = 0;
-                   $stats[8] = $stats['atime'] = time();
-                   $stats[9] = $stats['mtime'] = $irods_stats->mtime;
-                   $stats[10] = $stats['ctime'] = $irods_stats->ctime;
-                   $stats[11] = $stats['blksize'] = -1;
-                   $stats[12] = $stats['blocks'] = -1;
-                   return $stats;
-                 } catch (Exception $e) {
-                   trigger_error("Got an exception: $e", E_USER_WARNING);
-                   return false;
-                 }
-        }
-                 
-        /**
-         * @param $conn
-         * @param $file
-         * @return mixed
-         */
-        private function stat_file($conn, $path_str) {
-                 try {
-                   $irods_stats = $conn->getFileStats($path_str);
-                   if (!$irods_stats)
-                     return false;
-                   $stats = array();
-                   $stats[0] = $stats['dev'] = 0;
-                   $stats[1] = $stats['ino'] = 0;
-                   $stats[2] = $stats['mode'] = octdec('100644');
-                   $stats[3] = $stats['nlink'] = 1;
-                   $stats[4] = $stats['uid'] = 0;
-                   $stats[5] = $stats['gid'] = 0;
-                   $stats[6] = $stats['rdev'] = -1;
-                   $stats[7] = $stats['size'] = $irods_stats->size;
-                   $stats[8] = $stats['atime'] = time();
-                   $stats[9] = $stats['mtime'] = $irods_stats->mtime;
-                   $stats[10] = $stats['ctime'] = $irods_stats->ctime;
-                   $stats[11] = $stats['blksize'] = -1;
-                   $stats[12] = $stats['blocks'] = -1;
-                   return $stats;
-                 } catch (Exception $e) {
-                   trigger_error("Got an exception: $e", E_USER_WARNING);
-                   return false;
-                 }
-        }
-                 
-	/**
-	 * mkdir() handler.
-	 *
-	 * @access private
-	 */
-	function mkdir ($url, $mode, $options) {
-		try {
-                  $file=ProdsDir::fromURI($url);
-                  $conn = RODSConnManager::getConn($file->account);
-                  $conn->mkdir($file->path_str);
-                  
-                  RODSConnManager::releaseConn($conn);
-                  return true;
-		} catch (Exception $e) {
-                  trigger_error("Got an exception:$e", E_USER_WARNING);
-                  return false;
-		}
-	}
-
-	/**
-	 * rmdir() handler
-	 *
-	 * @param $url
-	 * @return bool
-	 */
-	function rmdir ($url) {
-		try {
-			$file=ProdsDir::fromURI($url);
-			$conn = RODSConnManager::getConn($file->account);
-			$conn->rmdir($file->path_str);
-
-			RODSConnManager::releaseConn($conn);
-			return true;
-		} catch (Exception $e) {
-			trigger_error("Got an exception:$e", E_USER_WARNING);
-			return false;
-		}
-	}
-
-	/**
-	 * unlink() handler.
-	 *
-	 * @access private
-	 */
-	function unlink ($url) {
-		try {
-                  $file=ProdsDir::fromURI($url);
-                  $conn = RODSConnManager::getConn($file->account);
-                  if (is_dir($url)) {
-                    $conn->rmdir($file->path_str, true, true);
-                  } else {
-                    $conn->fileUnlink($file->path_str, NULL, true);
-                  }
-                  
-                  RODSConnManager::releaseConn($conn);
-                  return true;
-		} catch (Exception $e) {
-                  trigger_error("Got an exception:$e", E_USER_WARNING);
-                  return false;
-		}
-	}
-
-	/**
-	 * rename() handler.
-	 *
-	 * @access private
-	 */
-        function rename ($url_from, $url_to) {
-                try {
-                  $file_from=ProdsDir::fromURI($url_from);
-                  $file_to=ProdsDir::fromURI($url_to);
-                  $conn = RODSConnManager::getConn($file_from->account);
-
-                  if (is_dir($url_from)) {
-                    $conn->rename($file_from->path_str, $file_to->path_str, 0);
-                  } else {
-                    $conn->rename($file_from->path_str, $file_to->path_str, 1);
-                  }
-
-                  RODSConnManager::releaseConn($conn);
-                  return true;
-                } catch (Exception $e) {
-                  trigger_error("Got an exception:$e", E_USER_WARNING);
-                  return false;
-                }
-        }
-
-	/**
-	 * opendir() handler.
-	 *
-	 * @access private
-	 */
-	public function dir_opendir ($path, $options) 
-	{
-		try {
-		  $this->dir=ProdsDir::fromURI($path,true);
-		  return true;
-		} catch (Exception $e) {
-		  trigger_error("Got an exception:$e", E_USER_WARNING);
-		  return false;
-		}
-	}
-
-    /**
-     * readdir() handler.
-     *
-     * @access private
-     */
-    public function dir_readdir()
-    {
-        try {
-            $child = $this->dir->getNextChild();
-            if ($child === false) return false;
-            return $child->getName();
-        } catch (Exception $e) {
-            trigger_error("Got an exception:$e", E_USER_WARNING);
-            return false;
-        }
-    }
-
-	/**
-	 * fread() and fgets() handler.
-	 *
-	 * @access private
-	 */
-	public function stream_read ($count) {
-		if (in_array ($this->file->getOpenMode(), array ('w', 'a', 'x'))) {
-			return false;
-		}
-		try {
-  		$ret = $this->file->read($count);
-  		$this->position=$this->file->tell();
-  		return $ret;
-  	} catch (Exception $e) {
-		  trigger_error("Got an exception:$e", E_USER_WARNING);
-		  return false;
-		}	
-	}
-
-	/**
-	 * fwrite() handler.
-	 *
-	 * @access private
-	 */
-	public function stream_write ($data) {
-		if ($this->file->getOpenMode() =='r') {
-			return false;
-		}
-		try {
-  		$ret = $this->file->write($data);
-  		$this->position=$this->file->tell();
-  		return $ret;
-  	} catch (Exception $e) {
-		  trigger_error("Got an exception:$e", E_USER_WARNING);
-		  return false;
-		}	
-	}
-    /**
-     * rewinddir() handler.
-     *
-     * @access private
-     */
-    public function dir_rewinddir()
-    {
-        try {
-            $this->dir->rewind();
-            return true;
-        } catch (Exception $e) {
-            trigger_error("Got an exception:$e", E_USER_WARNING);
-            return false;
-        }
-    }
-
-    /**
-     * closedir() handler.
-     *
-     * @access private
-     */
-    public function dir_closedir()
-    {
-        try {
-            $this->dir->rewind();
-            return true;
-        } catch (Exception $e) {
-            trigger_error("Got an exception:$e", E_USER_WARNING);
-            return false;
-        }
-    }
-
-    /**
-     * fopen() handler.
-     *
-     * @access private
-     */
-    public function stream_open($path, $mode, $options, &$opened_path)
-    {
-
-        // get rid of tailing 'b', if any.
-        if (($mode{strlen($mode) - 1} == 'b') && (strlen($mode) > 1))
-            $mode = substr($mode, 0, strlen($mode) - 1);
-         try {
-            $this->file = ProdsFile::fromURI($path);
-            $this->file->open($mode);
-            return true;
-        } catch (Exception $e) {
-            trigger_error("Got an exception:$e", E_USER_WARNING);
-            return false;
-        }
-    }
-
-	/**
-	 * fstat() handler.
-	 *
-	 * @access private
-	 */
-	function stream_stat () {
-	  
-	  try {
-	    $stats=$this->file->getStats();
-	    return array (
-  			-1, -1, -1, -1, -1, -1, $stats->size, time (), $stats->mtime, $stats->ctime, -1, -1,
-  			'dev' => -1,
-  			'ino' => -1,
-  			'mode' => -1,
-  			'nlink' => -1,
-  			'uid' => -1,
-  			'gid' => -1,
-  			'rdev' => -1,
-  			'size' => $stats->size,
-  			'atime' => time (),
-  			'mtime' => $stats->mtime,
-  			'ctime' => $stats->ctime,
-  			'blksize' => -1,
-  			'blocks' => -1,
-  		);
-	  } catch (Exception $e) {
-		  trigger_error("Got an exception:$e", E_USER_WARNING);
-		  return false;
-		} 
-	}
-
-	/**
-	 * fclose() handler.
-	 *
-	 * @access private
-	 */
-	function stream_close () {
-		$this->file->close();
-		$this->position = 0;
-		$this->file = null;
-		$this->dir = null;
-	}
-
-    /**
-     * ftell() handler.
-     *
-     * @access private
-     */
-    function stream_tell()
-    {
-        return $this->position;
-    }
-
-    /**
-     * feof() handler.
-     *
-     * @access private
-     */
-    function stream_eof()
-    {
-        try {
-            $stats = $this->file->getStats();
-            return $this->position >= $stats->size;
-        } catch (Exception $e) {
-            trigger_error("Got an exception:$e", E_USER_WARNING);
-            return true;
-        }
-    }
-
-    /**
-     * fseek() handler.
-     *
-     * @access private
-     */
-    function stream_seek($offset, $whence)
-    {
-        try {
-            $this->file->seek($offset, $whence);
-            return true;
-        } catch (Exception $e) {
-            trigger_error("Got an exception:$e", E_USER_WARNING);
-            return false;
-        }
-    }
-
-    /**
-     * fflush() handler.  Please Note: This method must be called for any
-     * changes to be committed to the repository.
-     *
-     * @access private
-     */
-    function stream_flush()
-    {
-        return true;
-    }
-}
-  
-stream_wrapper_register('rods', 'ProdsStreamer')
-    or die ('Failed to register protocol:rods');
-stream_wrapper_register('rods+ticket', 'ProdsStreamer')
-    or die ('Failed to register protocol:rods');
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsTicket.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsTicket.class.php
deleted file mode 100644
index 0038a9c073..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsTicket.class.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Developer: Daniel Speichert <s@drexel.edu>
- * Date: 30.01.13
- * Time: 14:15
- */
-
-require_once("autoload.inc.php");
-
-class ProdsTicket
-{
-    private $account;
-
-    public function __construct( RODSAccount &$account )
-    {
-        $this->account = $account;
-    }
-
-    /*
-     * This is just a stupid wrapper
-     * It proxifies RODSConn->createTicket
-     */
-    public function createTicket( $object, $permission = 'read', $ticket = '' )
-    {
-        $conn = RODSConnManager::getConn($this->account);
-        $ticket = $conn->createTicket($object, $permission, $ticket );
-        RODSConnManager::releaseConn($conn);
-        return $ticket;
-    }
-
-    /*
-     * This is also a stupid wrapper
-     * It proxifies RODSConn->deleteTicket
-     */
-    public function deleteTicket( $ticket )
-    {
-        $conn = RODSConnManager::getConn($this->account);
-        $ticket = $conn->deleteTicket( $ticket );
-        RODSConnManager::releaseConn($conn);
-    }
-}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php
deleted file mode 100644
index ba4c5ad96b..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-/**#@+
- * Constants
- */
-/**
- * Maximum lengh of password string. Only up to this lengh of password are submitted to RODS server.
- */
-define("MAX_PASSWORD_LEN", 50);
-/**#@-*/
-
-require_once("autoload.inc.php");
-
-class RODSAccount
-{
- /**#@+
-  * @var string 
-  */
-  public $user;
-  public $pass;
-  public $host;
-  public $port;
-  public $zone; 
-  public $default_resc;
-  public $auth_type;
-  public $ticket;
-  /**#@-*/
-  
-  public function __construct($host, $port, $user, $pass, $zone="", 
-    $default_resc="", $auth_type="irods",$ticket = '')
-  {
-    $this->host=$host;
-    $this->port=$port;
-    $this->user=$user;
-    $this->pass=$pass;
-    $this->zone=$zone;
-    $this->default_resc=$default_resc;
-    $this->auth_type=$auth_type;
-     $this->ticket = $ticket;
-  }
-  
- /**
-	* Create a RODSAccount object from URI string.
-	* @param string $uri 
-	* @return a new RODSAccount object
-	*/
-  public static function fromURI($uri)
-  {
-    $url=parse_url($uri);
-    
-    $host=isset($url['host'])?$url['host']:''; 
-    $port=isset($url['port'])?$url['port']:'';   
-    
-    $user='';
-    $zone='';
-    $authtype='irods';
-    if (isset($url['user']))
-    {
-      if (strstr($url['user'],".")!==false) {
-        $user_array=@explode(".",$url['user']);
-        if (count($user_array)===3) {
-          $user=$user_array[0];
-          $zone=$user_array[1];
-          $authtype=$user_array[2];
-        }
-        else {
-          $user=$user_array[0];
-          $zone=$user_array[1];
-        }
-      } 
-      else
-        $user=$url['user'];
-    }  
-    
-    $pass=isset($url['pass'])?$url['pass']:'';
-    
-    return (new RODSAccount($host, $port, $user, $pass, $zone, "", $authtype,$ticket = ''));
-  }
-  
-  
-
-    public function equals(RODSAccount $other)
-    {
-        if (!isset($other))
-            return false;
-
-        if (($this->host == $other->host) &&
-            ($this->port == $other->port) &&
-            ($this->user == $other->user)
-        ) {
-            $ret_val = true;
-        } else
-            $ret_val = false;
-
-        //echo ( "$this->host,$this->port,$this->user vs. $other->host,$other->port,$other->user = $ret_val");
-        //flush();
-        return $ret_val;
-    }
-
-    public function getSignature()
-    {
-        return (bin2hex(md5("$this->user.$this->zone:this->pass@$this->host:$this->port.$this->ticket", TRUE)));
-    }
-
-    public function __toString()
-    {
-        return "$this->user.$this->zone:(password hidden)@$this->host:$this->port";
-    }
-
-    public function toURI()
-    {
-        return ($this->user .
-            (empty($this->zone) ? '' : '.' . $this->zone) .
-            "@" . $this->host . ":" . $this->port);
-    }
-
-    /**
-     * Get user information
-     * @param string username, if not specified, it will use current username instead
-     * @return array with fields: id, name, type, zone, dn, info, comment, ctime, mtime. If user not found return empty array.
-     */
-    public function getUserInfo($username = NULL,
-                                $get_cb = array('RODSConnManager', 'getConn'),
-                                $rel_cb = array('RODSConnManager', 'releaseConn'))
-    {
-        //$conn = RODSConnManager::getConn($this);
-        $conn = call_user_func_array($get_cb, array(&$this));
-        //TODO: Overcome fear of passing $this by reference or stop passing $this by reference
-        $userinfo = $conn->getUserInfo($username);
-        //RODSConnManager::releaseConn($conn);
-        call_user_func($rel_cb, $conn);
-        if ((!empty($userinfo)) && (!empty($userinfo['zone'])))
-            $this->zone = $userinfo['zone'];
-        return $userinfo;
-    }
-
-    /**
-     * Get a temp password for current user
-     * @return string of temp password
-     */
-    public function getTempPassword($get_cb = array('RODSConnManager', 'getConn'),
-                                    $rel_cb = array('RODSConnManager', 'releaseConn'))
-    {
-        //$conn = RODSConnManager::getConn($this);
-        $conn = call_user_func_array($get_cb, array(&$this));
-        //TODO: Overcome fear of passing $this by reference or stop passing $this by reference
-        $temppass = $conn->getTempPassword();
-        // RODSConnManager::releaseConn($conn);
-        call_user_func($rel_cb, $conn);
-        return $temppass;
-    }
-
-    /**
-     * Get user's home directory
-     * @param string init_path, if specified, it will overwrite the default path
-     * @return ProdsDir User's home directory
-     */
-    public function getUserHomeDir($init_path = NULL)
-    {
-        if (empty($this->zone))
-            $this->getUserInfo();
-        if (isset($init_path)) {
-            $dir = new ProdsDir($this, $init_path);
-            if ($dir->exists()) {
-                return $dir;
-            }
-        }
-        return new ProdsDir($this, "/$this->zone/home/$this->user");
-    }
-
-    /**
-     * Get user's home directory URI
-     * @param string init_path, if specified, it will overwrite the default path
-     * @return String User's home
-     */
-    public function getUserHomeDirURI($init_path = NULL)
-    {
-        $dir = $this->getUserHomeDir($init_path);
-        return $dir->toURI();
-    }
-
-    /**
-     * Get user's trash directory
-     * @return ProdsDir User's trash dir
-     */
-    public function getUserTrashDir()
-    {
-        if (empty($this->zone))
-            $this->getUserInfo();
-        return new ProdsDir($this, "/$this->zone/trash/home/$this->user");
-    }
-
-    /**
-     * Get user's trash directory URI
-     * @return String User's trash URI
-     */
-    public function getUserTrashDirURI()
-    {
-        $dir = $this->getUserTrashDir();
-        return $dir->toURI();
-    }
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php
deleted file mode 100644
index c10f880a5c..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php
+++ /dev/null
@@ -1,1613 +0,0 @@
-<?php
-/**
- * RODS connection class
- * @author Sifang Lu <sifang@sdsc.edu>
- * @copyright Copyright &copy; 2007, TBD
- * @package RODSConn
- */
-
-
-require_once("autoload.inc.php");
-require_once("RodsAPINum.inc.php");
-require_once("RodsConst.inc.php");
-
-if (!defined("O_RDONLY")) define ("O_RDONLY", 0);
-if (!defined("O_WRONLY")) define ("O_WRONLY", 1);
-if (!defined("O_RDWR")) define ("O_RDWR", 2);
-if (!defined("O_TRUNC")) define ("O_TRUNC", 512);
-
-class RODSConn
-{
-  private $conn;     // (resource) socket connection to RODS server
-  
-  private $account;  // RODS user account  
-  
-  private $idle;
-  private $id;
-  
-  public  $connected;
-  
-  /**
-   * Makes a new connection to RODS server, with supplied user information (name, passwd etc.) 
-   * @param string $host hostname 
-   * @param string $port port number 
-   * @param string $user username 
-   * @param string $pass passwd 
-   * @param string $zone zonename 
-   */
-  public function __construct(RODSAccount &$account)
-  {
-    $this->account=$account;
-    $this->connected=false;
-    $this->conn=NULL;
-    $this->idle=true;
-  }
-  
-  public function __destruct()
-  {
-    if ($this->connected===true)
-      $this->disconnect();
-  }
-  
-  public function equals(RODSConn $other)
-  {
-    return $this->account->equals($other->account);
-  }
-  
-  public function getSignature()
-  {
-    return $this->account->getSignature();
-  }
-  
-  public function lock()
-  {
-    $this->idle=false;
-  }
-  
-  public function unlock()
-  {
-    $this->idle=true;
-  }
-  
-  public function isIdle()
-  {
-    return ($this->idle);
-  }
-  
-  public function getId()
-  {
-    return $this->id;
-  }
-  
-  public function setId($id)
-  {
-    $this->id=$id;
-  }
-  
-  public function getAccount()
-  {
-    return $this->account;
-  }
-  
-  public function connect()
-  {
-    $host=$this->account->host;
-    $port=$this->account->port;
-    $user=$this->account->user;
-    $pass=$this->account->pass;
-    $zone=$this->account->zone;
-    $auth_type = $this->account->auth_type;
-
-    // if we're going to use PAM, set up the socket context 
-    // options for SSL connections when we open the connection
-    if (strcasecmp($auth_type, "PAM") == 0) {
-      $ssl_opts = array('ssl' => array());
-      if (array_key_exists('ssl', $GLOBALS['PRODS_CONFIG'])) {
-        $ssl_conf = $GLOBALS['PRODS_CONFIG']['ssl'];
-        if (array_key_exists('verify_peer', $ssl_conf)) {
-          if (strcasecmp("true", $ssl_conf['verify_peer']) == 0) {
-            $ssl_opts['ssl']['verify_peer'] = true;
-          }
-        }
-        if (array_key_exists('allow_self_signed', $ssl_conf)) {
-          if (strcasecmp("true", $ssl_conf['allow_self_signed']) == 0) {
-            $ssl_opts['ssl']['allow_self_signed'] = true;
-          }
-        }
-        if (array_key_exists('cafile', $ssl_conf)) {
-          $ssl_opts['ssl']['cafile'] = $ssl_conf['cafile'];
-        }
-        if (array_key_exists('capath', $ssl_conf)) {
-          $ssl_opts['ssl']['capath'] = $ssl_conf['capath'];
-        }
-      }
-      $ssl_ctx = stream_context_get_default($ssl_opts);
-      $sock_timeout = ini_get("default_socket_timeout");
-      $conn = @stream_socket_client("tcp://$host:$port", $errno, $errstr,
-        $sock_timeout, STREAM_CLIENT_CONNECT, $ssl_ctx);
-    }
-    else {
-      $conn = @fsockopen($host, $port, $errno, $errstr);
-    }
-    if (!$conn)
-      throw new RODSException("Connection to '$host:$port' failed.1: ($errno)$errstr. ",
-        "SYS_SOCK_OPEN_ERR");
-    $this->conn=$conn;
-    
-    // connect to RODS server
-    $msg=RODSMessage::packConnectMsg($user,$zone);
-    fwrite($conn, $msg);
-    
-    $msg=new RODSMessage();
-    $intInfo=$msg->unpack($conn);
-    if ($intInfo<0)
-    {
-      throw new RODSException("Connection to '$host:$port' failed.2. User: $user Zone: $zone",
-        $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-    }
-    
-    // are we doing PAM authentication
-    if (strcasecmp($auth_type, "PAM") == 0) 
-    {
-      // Ask server to turn on SSL
-      $req_packet = new RP_sslStartInp();
-      $msg=new RODSMessage("RODS_API_REQ_T", $req_packet, 
-        $GLOBALS['PRODS_API_NUMS']['SSL_START_AN']);
-      fwrite($conn, $msg->pack());
-      $msg=new RODSMessage();
-      $intInfo=$msg->unpack($conn);
-      if ($intInfo<0) 
-      {
-        throw new RODSException("Connection to '$host:$port' failed.ssl1. User: $user Zone: $zone",
-          $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-      }
-      // Turn on SSL on our side
-      if (!stream_socket_enable_crypto($conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
-        throw new RODSException("Error turning on SSL on connection to server '$host:$port'.");
-      }
-
-      // all good ... do the PAM authentication over the encrypted connection
-      $req_packet = new RP_pamAuthRequestInp($user, $pass, -1);
-      $msg=new RODSMessage("RODS_API_REQ_T", $req_packet,
-        $GLOBALS['PRODS_API_NUMS']['PAM_AUTH_REQUEST_AN']);
-      fwrite($conn, $msg->pack());
-      $msg=new RODSMessage();
-      $intInfo=$msg->unpack($conn);
-      if ($intInfo<0)
-      {
-        throw new RODSException("PAM auth failed at server '$host:$port' User: $user Zone: $zone",
-          $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-      }
-      
-      // Update the account object with the temporary password
-      // and set the auth_type to irods for this connection
-      $pack = $msg->getBody();
-      $pass = $this->account->pass = $pack->irodsPamPassword;
-
-      // Done authentication ... turn ask the server to turn off SSL
-      $req_packet = new RP_sslEndInp();
-      $msg=new RODSMessage("RODS_API_REQ_T", $req_packet, 
-        $GLOBALS['PRODS_API_NUMS']['SSL_END_AN']);
-      fwrite($conn, $msg->pack());
-      $msg=new RODSMessage();
-      $intInfo=$msg->unpack($conn);
-      if ($intInfo<0) 
-      {
-        throw new RODSException("Connection to '$host:$port' failed.ssl2. User: $user Zone: $zone",
-          $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-      }
-      // De-activate SSL on the connection
-      stream_socket_enable_crypto($conn, false);
-
-      // nasty hack ... some characters are left over to be read
-      // from the socket after the SSL shutdown, and I can't 
-      // figure out how to consume them via SSL routines, so I
-      // just read them and throw them away. They need to be consumed
-      // or later reads get out of sync with the API responses
-      $r = array($conn);
-      $w = $e = null;
-      while (stream_select($r, $w, $e, 0) > 0) {
-        $s = fread($conn, 1);
-      }
-
-    }
-      
-    // request authentication
-    $msg=new RODSMessage("RODS_API_REQ_T",NULL,
-      $GLOBALS['PRODS_API_NUMS']['AUTH_REQUEST_AN']);
-    fwrite($conn, $msg->pack());    
-    
-    // get chalange string
-    $msg=new RODSMessage();
-    $intInfo=$msg->unpack($conn);
-    if ($intInfo<0)
-    {
-      throw new RODSException("Connection to '$host:$port' failed.3. User: $user Zone: $zone",
-        $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-    }
-    $pack=$msg->getBody();
-    $challenge_b64encoded=$pack->challenge;
-    $challenge=base64_decode($challenge_b64encoded);
-    
-    // encode chalange with passwd
-    $pad_pass=str_pad($pass,MAX_PASSWORD_LEN,"\0");
-    $pwmd5=md5($challenge.$pad_pass,true);
-    for ($i=0;$i<strlen($pwmd5);$i++) //"escape" the string in RODS way...
-    {
-      if (ord($pwmd5[$i])==0)
-      {
-        $pwmd5[$i]=chr(1);
-      }
-    }
-    $response=base64_encode($pwmd5);
-    
-    // set response
-    $resp_packet=new RP_authResponseInp($response,$user);
-    $msg=new RODSMessage("RODS_API_REQ_T",$resp_packet,
-      $GLOBALS['PRODS_API_NUMS']['AUTH_RESPONSE_AN']);
-    fwrite($conn, $msg->pack());
-    
-    // check if we are connected
-    // get chalange string
-    $msg=new RODSMessage();
-    $intInfo=$msg->unpack($conn);
-    if ($intInfo<0)
-    {
-      $this->disconnect();
-      throw new RODSException("Connection to '$host:$port' failed.4 (login failed, possible wrong user/passwd). User: $user Pass: $pass Zone: $zone",
-        $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-    }
-    
-    $this->connected=true;
-    // use ticket if specified
-        if( !empty($this->account->ticket) ) {
-            $ticket_packet = new RP_ticketAdminInp('session', $this->account->ticket);
-            $msg = new RODSMessage('RODS_API_REQ_T', $ticket_packet, 723);
-            fwrite($conn, $msg->pack());
-
-            // get response
-            $msg = new RODSMessage();
-            $intInfo = $msg->unpack($conn);
-            if ($intInfo < 0) {
-                $this->disconnect();
-                throw new RODSException('Cannot set session ticket.',
-                    $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-            }
-        }
-
-  }
-    /**
-     * Close the connection (socket)
-     */
-    public function disconnect($force = false)
-    {
-        if (($this->connected === false) && ($force !== true))
-            return;
-
-        $msg = new RODSMessage("RODS_DISCONNECT_T");
-        fwrite($this->conn, $msg->pack());
-        fclose($this->conn);
-        $this->connected = false;
-    }
-
-    public function createTicket( $object, $permission = 'read', $ticket = '' )
-    {
-        if ($this->connected === false) {
-            throw new RODSException("createTicket needs an active connection, but the connection is currently inactive",
-                'PERR_CONN_NOT_ACTIVE');
-        }
-        if( empty($ticket) )
-        {
-            // create a 16 characters long ticket
-            $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-            for ($i = 0; $i < 16; $i++)
-                $ticket .= $chars[mt_rand(1, strlen($chars))-1];
-        }
-
-        $ticket_packet = new RP_ticketAdminInp('create', $ticket, $permission, $object);
-        $msg = new RODSMessage('RODS_API_REQ_T', $ticket_packet, 723);
-        fwrite($this->conn, $msg->pack());
-
-        // get response
-        $msg = new RODSMessage();
-        $intInfo = $msg->unpack($this->conn);
-        if ($intInfo < 0) {
-            throw new RODSException('Cannot create ticket "'.$ticket.'" for object "'.$object.'" with permission "'.$permission.'".',
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-
-        return $ticket;
-    }
-
-    public function deleteTicket( $ticket )
-    {
-        if ($this->connected === false) {
-            throw new RODSException("deleteTicket needs an active connection, but the connection is currently inactive",
-                'PERR_CONN_NOT_ACTIVE');
-        }
-        $ticket_packet = new RP_ticketAdminInp('delete', $ticket);
-        $msg = new RODSMessage('RODS_API_REQ_T', $ticket_packet, 723);
-        fwrite($this->conn, $msg->pack());
-
-        // get response
-        $msg = new RODSMessage();
-        $intInfo = $msg->unpack($this->conn);
-        if ($intInfo < 0) {
-            throw new RODSException('Cannot delete ticket "'.$ticket.'".',
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-    }
-
-    /**
-     * Get a temp password from the server.
-     * @param string $key key obtained from server to generate password. If this key is not specified, this function will ask server for a new key.
-     * @return string temp password
-     */
-    public function getTempPassword($key = NULL)
-    {
-        if ($this->connected === false) {
-            throw new RODSException("getTempPassword needs an active connection, but the connection is currently inactive",
-                'PERR_CONN_NOT_ACTIVE');
-        }
-        if (NULL == $key)
-            $key = $this->getKeyForTempPassword();
-
-        $auth_str = str_pad($key . $this->account->pass, 100, "\0");
-        $pwmd5 = bin2hex(md5($auth_str, true));
-
-        return $pwmd5;
-    }
-
-
-    /**
-     * Get a key for temp password from the server. this key can then be hashed together with real password to generate an temp password.
-     * @return string key for temp password
-     */
-    public function getKeyForTempPassword()
-    {
-        if ($this->connected === false) {
-            throw new RODSException("getKeyForTempPassword needs an active connection, but the connection is currently inactive",
-                'PERR_CONN_NOT_ACTIVE');
-        }
-        $msg = new RODSMessage("RODS_API_REQ_T", null,
-            $GLOBALS['PRODS_API_NUMS']['GET_TEMP_PASSWORD_AN']);
-
-        fwrite($this->conn, $msg->pack()); // send it
-        $msg = new RODSMessage();
-        $intInfo = (int)$msg->unpack($this->conn);
-        if ($intInfo < 0) {
-            throw new RODSException("RODSConn::getKeyForTempPassword has got an error from the server",
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-        return ($msg->getBody()->stringToHashWith);
-    }
-
-    /**
-     * Get user information
-     * @param string username, if not specified, it will use current username instead
-     * @return array with fields: id, name, type, zone, dn, info, comment, ctime, mtime. If user not found return empty array.
-     */
-    public function getUserInfo($user = NULL)
-    {
-        if (!isset($user))
-            $user = $this->account->user;
-
-        // set selected value
-        $select_val = array("COL_USER_ID", "COL_USER_NAME", "COL_USER_TYPE",
-            "COL_USER_ZONE", "COL_USER_DN", "COL_USER_INFO",
-            "COL_USER_COMMENT", "COL_USER_CREATE_TIME", "COL_USER_MODIFY_TIME");
-        $cond = array(new RODSQueryCondition("COL_USER_NAME", $user));
-        $que_result = $this->genQuery($select_val, $cond);
-
-        if (false === $que_result) {
-            return array();
-        } else {
-            $retval = array();
-            $retval['id'] = $que_result["COL_USER_ID"][0];
-            $retval['name'] = $que_result["COL_USER_NAME"][0];
-            $retval['type'] = $que_result["COL_USER_TYPE"][0];
-            // $retval['zone']=$que_result["COL_USER_ZONE"][0]; This can cause confusion if
-            // username is same as another federated grid - sometimes multiple records are returned.
-            // Changed source to force user to provide a zone until another method is suggested.
-            if ($this->account->zone == "") {
-                $retval['zone'] = $que_result["COL_USER_ZONE"][0];
-            } else {
-                $retval['zone'] = $this->account->zone;
-            }
-            $retval['dn'] = $que_result["COL_USER_DN"][0];
-            $retval['info'] = $que_result["COL_USER_INFO"][0];
-            $retval['comment'] = $que_result["COL_USER_COMMENT"][0];
-            $retval['ctime'] = $que_result["COL_USER_CREATE_TIME"][0];
-            $retval['mtime'] = $que_result["COL_USER_MODIFY_TIME"][0];
-
-            return $retval;
-        }
-    }
-
-    /**
-     * Make a new directory
-     * @param string $dir input direcotory path string
-     */
-    public function mkdir($dir)
-    {
-        $collInp_pk = new RP_CollInp($dir);
-        $msg = new RODSMessage("RODS_API_REQ_T", $collInp_pk,
-            $GLOBALS['PRODS_API_NUMS']['COLL_CREATE_AN']);
-        fwrite($this->conn, $msg->pack()); // send it
-        $msg = new RODSMessage();
-        $intInfo = (int)$msg->unpack($this->conn);
-        if ($intInfo < 0) {
-            if (RODSException::rodsErrCodeToAbbr($intInfo) == 'CATALOG_ALREADY_HAS_ITEM_BY_THAT_NAME') {
-                throw new RODSException("Collection '$dir' Already exists!",
-                    $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-            }
-            throw new RODSException("RODSConn::mkdir has got an error from the server",
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-    }
-
-    /**
-     * remove a directory
-     * @param string  $dirpath input direcotory path string
-     * @param boolean $recursive whether recursively delete all child files and child directories recursively.
-     * @param boolean $force whether force delete the file/dir. If force delete, all files will be wiped physically. Else, they are moved to trash derectory.
-     * @param array   $additional_flags An array of keyval pairs (array) reprenting additional flags passed to the server/client message. Each keyval pair is an array with first element repsenting the key, and second element representing the value (default to ''). Supported keys are:
-     * -    'irodsRmTrash' - whether this rm is a rmtrash operation
-     * -    'irodsAdminRmTrash' - whether this rm is a rmtrash operation done by admin user
-     * @param mixed   $status_update_func It can be an string or array that represents the status update function (see http://us.php.net/manual/en/language.pseudo-types.php#language.types.callback), which can update status based on the server status update. Leave it blank or 'null' if there is no need to update the status. The function will be called with an assossive arry as parameter, supported fields are:
-     * - 'filesCnt' - finished number of files from previous update (normally 10 but not the last update)
-     * - 'lastObjPath' - last object that was processed.
-     * If this function returns 1, progress will be stopped.
-     */
-    public function rmdir($dirpath, $recursive = true, $force = false,
-                          $additional_flags = array(), $status_update_func = null)
-    {
-        $options = array();
-        if ($force === true) {
-            $options["forceFlag"] = "";
-        }
-        if ($recursive === true) {
-            $options["recursiveOpr"] = "";
-        }
-        foreach ($additional_flags as $flagkey => $flagval) {
-            if (!empty($flagkey))
-                $options[$flagkey] = $flagval;
-        }
-        $options_pk = new RP_KeyValPair();
-        $options_pk->fromAssocArray($options);
-
-        $collInp_pk = new RP_CollInp($dirpath, $options_pk);
-        $msg = new RODSMessage("RODS_API_REQ_T", $collInp_pk,
-            $GLOBALS['PRODS_API_NUMS']['RM_COLL_AN']);
-        fwrite($this->conn, $msg->pack()); // send it
-        $msg = new RODSMessage();
-        $intInfo = (int)$msg->unpack($this->conn);
-        while ($msg->getBody() instanceof RP_CollOprStat) {
-            if (is_callable($status_update_func)) // call status update function if requested
-            {
-                $status = call_user_func($status_update_func,
-                    array(
-                        "filesCnt" => $msg->getBody()->filesCnt,
-                        "lastObjPath" => $msg->getBody()->lastObjPath
-                    )
-                );
-                if (false === $status)
-                    throw new Exception("status_update_func failed!");
-                else if (1 == $status) {
-                    return;
-                }
-            }
-
-            if ($intInfo == 0) //stop here if intinfo =0 (process completed)
-                break;
-            $this->replyStatusPacket();
-            $msg = new RODSMessage();
-            $intInfo = (int)$msg->unpack($this->conn);
-        }
-
-        if ($intInfo < 0) {
-            if (RODSException::rodsErrCodeToAbbr($intInfo) == 'CAT_NO_ROWS_FOUND') {
-                return;
-            }
-            throw new RODSException("RODSConn::rmdir has got an error from the server",
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-    }
-
-    // this is a temp work around for status packet reply.
-    // in status packet protocol, the server gives a status update packet:
-    // SYS_SVR_TO_CLI_COLL_STAT (99999996)
-    // and it expects an  integer only SYS_CLI_TO_SVR_COLL_STAT_REPLY (99999997)
-    private function replyStatusPacket()
-    {
-        fwrite($this->conn, pack("N", 99999997));
-    }
-
-    /**
-     * Get children direcotories of input direcotory path string
-     * @param string $dir input direcotory path string
-     * @return an array of string, each string is the name of a child directory. This fuction return empty array, if there is no child direcotry found
-     */
-    public function getChildDir($dir, $startingInx = 0, $maxresults = 500,
-                                &$total_num_rows = -1)
-    {
-        $cond = array(new RODSQueryCondition("COL_COLL_PARENT_NAME", $dir));
-        $que_result = $this->genQuery(array("COL_COLL_NAME"), $cond, array(),
-            $startingInx, $maxresults, true, array(), 0, $total_num_rows);
-
-        if (false === $que_result) {
-            return array();
-        } else {
-            if ($dir == "/") {
-                $result = array();
-                foreach ($que_result["COL_COLL_NAME"] as $childdir) {
-                    if ($childdir != "/") {
-                        $result[] = $childdir;
-                    }
-                }
-                return $result;
-            }
-
-            return array_values($que_result["COL_COLL_NAME"]);
-        }
-    }
-
-    /**
-     * Get children direcotories, with basic stats,  of input direcotory path string
-     * @param string $dir input direcotory path string
-     * @param $orderby An associated array specifying how to sort the result by attributes. Each array key is the attribute, array val is 0 (assendent) or 1 (dessendent). The supported attributes are "name", "owner", "mtime".
-     * @return an array of RODSDirStats
-     */
-    public function getChildDirWithStats($dir, $orderby = array(), $startingInx = 0,
-                                         $maxresults = 500, &$total_num_rows = -1)
-    {
-        // set selected value
-        $select_val = array("COL_COLL_NAME", "COL_COLL_ID", "COL_COLL_OWNER_NAME",
-            "COL_COLL_OWNER_ZONE", "COL_COLL_CREATE_TIME", "COL_COLL_MODIFY_TIME",
-            "COL_COLL_COMMENTS");
-        $select_attr = array();
-
-        // set order by
-        if (!empty($orderby)) {
-            $select_attr = array_fill(0, count($select_val), 1);
-            foreach ($orderby as $key => $val) {
-                if ($key == "name") {
-                    if ($val == 0) $select_attr[0] = ORDER_BY;
-                    else $select_attr[0] = ORDER_BY_DESC;
-                } else
-                    if ($key == "owner") {
-                        if ($val == 0) $select_attr[2] = ORDER_BY;
-                        else $select_attr[2] = ORDER_BY_DESC;
-                    } else
-                        if ($key == "mtime") {
-                            if ($val == 0) $select_attr[5] = ORDER_BY;
-                            else $select_attr[5] = ORDER_BY_DESC;
-                        }
-            }
-        }
-
-        $cond = array(new RODSQueryCondition("COL_COLL_PARENT_NAME", $dir));
-        $continueInx = 0;
-        $que_result = $this->genQuery($select_val, $cond,
-            array(), $startingInx, $maxresults, true,
-            $select_attr, $continueInx, $total_num_rows);
-
-        if (false === $que_result) {
-            return array();
-        } else {
-            $ret_val = array();
-            for ($i = 0; $i < count($que_result['COL_COLL_ID']); $i++) {
-                if ($que_result['COL_COLL_NAME'][$i] != "/") {
-                    $ret_val[] = new RODSDirStats(
-                        basename($que_result['COL_COLL_NAME'][$i]),
-                        $que_result['COL_COLL_OWNER_NAME'][$i],
-                        $que_result['COL_COLL_OWNER_ZONE'][$i],
-                        $que_result['COL_COLL_MODIFY_TIME'][$i],
-                        $que_result['COL_COLL_CREATE_TIME'][$i],
-                        $que_result['COL_COLL_ID'][$i],
-                        $que_result['COL_COLL_COMMENTS'][$i]
-                    );
-                }
-            }
-            return $ret_val;
-        }
-    }
-
-    /**
-     * Get children file of input direcotory path string
-     * @param string $dir input direcotory path string
-     * @return an array of string, each string is the name of a child file.  This fuction return empty array, if there is no child direcotry found.
-     */
-    public function getChildFile($dir, $startingInx = 0, $maxresults = 500,
-                                 &$total_num_rows = -1)
-    {
-        $cond = array(new RODSQueryCondition("COL_COLL_NAME", $dir));
-        $que_result = $this->genQuery(array("COL_DATA_NAME"), $cond, array(),
-            $startingInx, $maxresults, true, array(), 0, $total_num_rows);
-
-        if (false === $que_result) {
-            return array();
-        } else {
-            return array_values($que_result["COL_DATA_NAME"]);
-        }
-    }
-
-    /**
-     * Get children file, with basic stats, of input direcotory path string
-     * The stats
-     * @param string $dir input direcotory path string
-     * @param $orderby An associated array specifying how to sort the result by attributes. Each array key is the attribute, array val is 0 (assendent) or 1 (dessendent). The supported attributes are "name", "size", "owner", "mtime".
-     * @return an array of RODSFileStats
-     */
-    public function getChildFileWithStats($dir, array $orderby = array(),
-                                          $startingInx = 0, $maxresults = 500, &$total_num_rows = -1)
-    {
-        // set selected value
-        $select_val = array("COL_DATA_NAME", "COL_D_DATA_ID", "COL_DATA_TYPE_NAME",
-            "COL_D_RESC_NAME", "COL_DATA_SIZE", "COL_D_OWNER_NAME",
-            "COL_D_CREATE_TIME", "COL_D_MODIFY_TIME");
-        $select_attr = array();
-
-        // set order by
-        if (!empty($orderby)) {
-            $select_attr = array_fill(0, count($select_val), 1);
-            foreach ($orderby as $key => $val) {
-                if ($key == "name") {
-                    if ($val == 0) $select_attr[0] = ORDER_BY;
-                    else $select_attr[0] = ORDER_BY_DESC;
-                } else
-                    if ($key == "size") {
-                        if ($val == 0) $select_attr[4] = ORDER_BY;
-                        else $select_attr[4] = ORDER_BY_DESC;
-                    } else
-                        if ($key == "owner") {
-                            if ($val == 0) $select_attr[5] = ORDER_BY;
-                            else $select_attr[5] = ORDER_BY_DESC;
-                        } else
-                            if ($key == "mtime") {
-                                if ($val == 0) $select_attr[7] = ORDER_BY;
-                                else $select_attr[7] = ORDER_BY_DESC;
-                            }
-            }
-        }
-
-        $cond = array(new RODSQueryCondition("COL_COLL_NAME", $dir));
-        $continueInx = 0;
-        $que_result = $this->genQuery($select_val, $cond,
-            array(), $startingInx, $maxresults, true,
-            $select_attr, $continueInx, $total_num_rows);
-
-
-        if (false === $que_result) {
-            return array();
-        } else {
-            $ret_val = array();
-            for ($i = 0; $i < count($que_result['COL_D_DATA_ID']); $i++) {
-                $ret_val[] = new RODSFileStats(
-                    $que_result['COL_DATA_NAME'][$i],
-                    $que_result['COL_DATA_SIZE'][$i],
-                    $que_result['COL_D_OWNER_NAME'][$i],
-                    $que_result['COL_D_MODIFY_TIME'][$i],
-                    $que_result['COL_D_CREATE_TIME'][$i],
-                    $que_result['COL_D_DATA_ID'][$i],
-                    $que_result['COL_DATA_TYPE_NAME'][$i],
-                    $que_result['COL_D_RESC_NAME'][$i]
-                );
-            }
-            return $ret_val;
-        }
-    }
-
-    /**
-     * Get basic stats, of input dir path string
-     * @param string $dirpath input dir path string
-     * @return RODSDirStats. If dir does not exists, return fales.
-     */
-    public function getDirStats($dirpath)
-    {
-        $cond = array(new RODSQueryCondition("COL_COLL_NAME", $dirpath));
-
-        $que_result = $this->genQuery(
-            array("COL_COLL_NAME", "COL_COLL_ID", "COL_COLL_OWNER_NAME",
-                "COL_COLL_OWNER_ZONE", "COL_COLL_CREATE_TIME", "COL_COLL_MODIFY_TIME",
-                "COL_COLL_COMMENTS"),
-            $cond, array(), 0, 1, false);
-        if ($que_result === false) return false;
-
-        $stats = new RODSDirStats(
-            basename($que_result['COL_COLL_NAME'][0]),
-            $que_result['COL_COLL_OWNER_NAME'][0],
-            $que_result['COL_COLL_OWNER_ZONE'][0],
-            $que_result['COL_COLL_MODIFY_TIME'][0],
-            $que_result['COL_COLL_CREATE_TIME'][0],
-            $que_result['COL_COLL_ID'][0],
-            $que_result['COL_COLL_COMMENTS'][0]
-        );
-        return $stats;
-    }
-
-    /**
-     * Get basic stats, of input file path string
-     * @param string $filepath input file path string
-     * @return RODSFileStats. If file does not exists, return fales.
-     */
-    public function getFileStats($filepath)
-    {
-        $parent = dirname($filepath);
-        $filename = basename($filepath);
-
-        $cond = array(new RODSQueryCondition("COL_COLL_NAME", $parent),
-            new RODSQueryCondition("COL_DATA_NAME", $filename));
-
-        $que_result = $this->genQuery(
-            array("COL_DATA_NAME", "COL_D_DATA_ID", "COL_DATA_TYPE_NAME",
-                "COL_D_RESC_NAME", "COL_DATA_SIZE", "COL_D_OWNER_NAME", "COL_D_OWNER_ZONE",
-                "COL_D_CREATE_TIME",
-                "COL_D_MODIFY_TIME", "COL_D_COMMENTS"),
-            $cond, array(), 0, 1, false);
-        if ($que_result === false) return false;
-
-        $stats = new RODSFileStats(
-            $que_result['COL_DATA_NAME'][0],
-            $que_result['COL_DATA_SIZE'][0],
-            $que_result['COL_D_OWNER_NAME'][0],
-            $que_result['COL_D_OWNER_ZONE'][0],
-            $que_result['COL_D_MODIFY_TIME'][0],
-            $que_result['COL_D_CREATE_TIME'][0],
-            $que_result['COL_D_DATA_ID'][0],
-            $que_result['COL_DATA_TYPE_NAME'][0],
-            $que_result['COL_D_RESC_NAME'][0],
-            $que_result['COL_D_COMMENTS'][0]);
-        return $stats;
-    }
-
-    /**
-     * Check whether a directory (in string) exists on RODS server.
-     * @return true/false
-     */
-    public function dirExists($dir)
-    {
-        $cond = array(new RODSQueryCondition("COL_COLL_NAME", $dir));
-        $que_result = $this->genQuery(array("COL_COLL_ID"), $cond);
-
-        if ($que_result === false)
-            return false;
-        else
-            return true;
-    }
-
-    /**
-     * Check whether a file (in string) exists on RODS server.
-     * @return true/false
-     */
-    public function fileExists($filepath, $rescname = NULL)
-    {
-        $parent = dirname($filepath);
-        $filename = basename($filepath);
-        if (empty($rescname)) {
-            $cond = array(new RODSQueryCondition("COL_COLL_NAME", $parent),
-                new RODSQueryCondition("COL_DATA_NAME", $filename));
-            $que_result = $this->genQuery(array("COL_D_DATA_ID"), $cond);
-        } else {
-            $cond = array(new RODSQueryCondition("COL_COLL_NAME", $parent),
-                new RODSQueryCondition("COL_DATA_NAME", $filename),
-                new RODSQueryCondition("COL_D_RESC_NAME", $rescname));
-            $que_result = $this->genQuery(array("COL_D_DATA_ID"), $cond);
-        }
-
-        if ($que_result === false)
-            return false;
-        else
-            return true;
-    }
-
-    /**
-     * Replicate file to resources with options.
-     * @param string $path_src full path for the source file
-     * @param string $desc_resc destination resource
-     * @param array $options an assosive array of options:
-     *   - 'all'        (boolean): only meaningful if input resource is a resource group. Replicate to all the resources in the resource group.
-     *   - 'backupMode' (boolean): if a good copy already exists in this resource, don't make another copy.
-     *   - 'admin'      (boolean): admin user uses this option to backup/replicate other users files
-     *   - 'replNum'    (integer): the replica to copy, typically not needed
-     *   - 'srcResc'    (string): specifies the source resource of the data object to be replicate, only copies stored in this resource will be replicated. Otherwise, one of the copy will be replicated
-     * These options are all 'optional', if omitted, the server will try to do it anyway
-     * @return number of bytes written if success, in case of faliure, throw an exception
-     */
-    public function repl($path_src, $desc_resc, array $options = array())
-    {
-        require_once(dirname(__FILE__) . "/RODSObjIOOpr.inc.php");
-        require_once(dirname(__FILE__) . "/RodsGenQueryKeyWd.inc.php");
-
-        $optype = REPLICATE_OPR;
-
-        $opt_arr = array();
-        $opt_arr[$GLOBALS['PRODS_GENQUE_KEYWD']['DEST_RESC_NAME_KW']] = $desc_resc;
-        foreach ($options as $option_key => $option_val) {
-            switch ($option_key) {
-                case 'all':
-                    if ($option_val === true)
-                        $opt_arr[$GLOBALS['PRODS_GENQUE_KEYWD']['ALL_KW']] = '';
-                    break;
-
-                case 'admin':
-                    if ($option_val === true)
-                        $opt_arr[$GLOBALS['PRODS_GENQUE_KEYWD']['IRODS_ADMIN_KW']] = '';
-                    break;
-
-                case 'replNum':
-                    $opt_arr[$GLOBALS['PRODS_GENQUE_KEYWD']['REPL_NUM_KW']] = $option_val;
-                    break;
-
-                case 'backupMode':
-                    if ($option_val === true)
-                        $opt_arr[$GLOBALS['PRODS_GENQUE_KEYWD']
-                        ['BACKUP_RESC_NAME_KW']] = $desc_resc;
-                    break;
-
-                default:
-                    throw new RODSException("Option '$option_key'=>'$option_val' is not supported",
-                        'PERR_USER_INPUT_ERROR');
-            }
-        }
-
-        $keyvalpair = new RP_KeyValPair();
-        $keyvalpair->fromAssocArray($opt_arr);
-
-        $inp_pk = new RP_DataObjInp($path_src, 0, 0, 0, 0, 0, $optype, $keyvalpair);
-
-        $msg = new RODSMessage("RODS_API_REQ_T", $inp_pk,
-            $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_REPL_AN']);
-        fwrite($this->conn, $msg->pack()); // send it
-        $msg = new RODSMessage();
-        $intInfo = (int)$msg->unpack($this->conn);
-        if ($intInfo < 0) {
-            throw new RODSException("RODSConn::repl has got an error from the server",
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-
-        $retpk = $msg->getBody();
-        return $retpk->bytesWritten;
-    }
-
-    /**
-     * Rename path_src to path_dest.
-     * @param string $path_src
-     * @param string $path_dest
-     * @param integer $path_type if 0, then path type is file, if 1, then path type if directory
-     * @return true/false
-     */
-    public function rename($path_src, $path_dest, $path_type)
-    {
-        require_once(dirname(__FILE__) . "/RODSObjIOOpr.inc.php");
-
-        if ($path_type === 0) {
-            $path_type_magic_num = RENAME_DATA_OBJ;
-        } else {
-            $path_type_magic_num = RENAME_COLL;
-        }
-        $src_pk = new RP_DataObjInp($path_src, 0, 0, 0, 0, 0, $path_type_magic_num);
-        $dest_pk = new RP_DataObjInp($path_dest, 0, 0, 0, 0, 0, $path_type_magic_num);
-        $inp_pk = new RP_DataObjCopyInp($src_pk, $dest_pk);
-        $msg = new RODSMessage("RODS_API_REQ_T", $inp_pk,
-            $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_RENAME_AN']);
-        fwrite($this->conn, $msg->pack()); // send it
-        $msg = new RODSMessage();
-        $intInfo = (int)$msg->unpack($this->conn);
-        if ($intInfo < 0) {
-            throw new RODSException("RODSConn::rename has got an error from the server",
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-    }
-
-    /**
-     * Open a file path (string) exists on RODS server.
-     *
-     * @param string $path file path
-     * @param string $mode open mode. Supported modes are:
-     *   'r'     Open for reading only; place the file pointer at the beginning of the file.
-     *   'r+'    Open for reading and writing; place the file pointer at the beginning of the file.
-     *   'w'    Open for writing only; place the file pointer at the beginning of the file and truncate the file to zero length. If the file does not exist, attempt to create it.
-     *   'w+'    Open for reading and writing; place the file pointer at the beginning of the file and truncate the file to zero length. If the file does not exist, attempt to create it.
-     *   'a'    Open for writing only; place the file pointer at the end of the file. If the file does not exist, attempt to create it.
-     *   'a+'    Open for reading and writing; place the file pointer at the end of the file. If the file does not exist, attempt to create it.
-     *   'x'    Create and open for writing only; place the file pointer at the beginning of the file. If the file already exists, the fopen() call will fail by returning FALSE and generating an error of level E_WARNING. If the file does not exist, attempt to create it. This is equivalent to specifying O_EXCL|O_CREAT flags for the underlying open(2) system call.
-     *   'x+'    Create and open for reading and writing; place the file pointer at the beginning of the file. If the file already exists, the fopen() call will fail by returning FALSE and generating an error of level E_WARNING. If the file does not exist, attempt to create it. This is equivalent to specifying O_EXCL|O_CREAT flags for the underlying open(2) system call.
-     * @param postion updated position
-     * @param string $rescname. Note that this parameter is required only if the file does not exists (create mode). If the file already exists, and if file resource is unknown or unique or you-dont-care for that file, leave the field, or pass NULL.
-     * @param boolean $assum_file_exists. This parameter specifies whether file exists. If the value is false, this mothod will check with RODS server to make sure. If value is true, the check will NOT be done. Default value is false.
-     * @param string $filetype. This parameter only make sense when you want to specify the file type, if file does not exists (create mode). If not specified, it defaults to "generic"
-     * @param integer $cmode. This parameter is only used for "createmode". It specifies the file mode on physical storage system (RODS vault), in octal 4 digit format. For instance, 0644 is owner readable/writeable, and nothing else. 0777 is all readable, writable, and excutable. If not specified, and the open flag requirs create mode, it defaults to 0644.
-     * @return integer level 1 descriptor
-     */
-    public function openFileDesc($path, $mode, &$position, $rescname = NULL,
-                                 $assum_file_exists = false, $filetype = 'generic', $cmode = 0644)
-    {
-        $create_if_not_exists = false;
-        $error_if_exists = false;
-        $seek_to_end_of_file = false;
-        $position = 0;
-
-        switch ($mode) {
-            case 'r':
-                $open_flag = O_RDONLY;
-                break;
-            case 'r+':
-                $open_flag = O_RDWR;
-                break;
-            case 'w':
-                $open_flag = O_WRONLY|O_TRUNC;
-                $create_if_not_exists = true;
-                break;
-            case 'w+':
-                $open_flag = O_RDWR|O_TRUNC;
-                $create_if_not_exists = true;
-                break;
-            case 'a':
-                $open_flag = O_WRONLY;
-                $create_if_not_exists = true;
-                $seek_to_end_of_file = true;
-                break;
-            case 'a+':
-                $open_flag = O_RDWR;
-                $create_if_not_exists = true;
-                $seek_to_end_of_file = true;
-                break;
-            case 'x':
-                $open_flag = O_WRONLY;
-                $create_if_not_exists = true;
-                $error_if_exists = true;
-                break;
-            case 'x+':
-                $open_flag = O_RDWR;
-                $create_if_not_exists = true;
-                $error_if_exists = true;
-                break;
-            default:
-                throw new RODSException("RODSConn::openFileDesc() does not recognize input mode:'$mode' ",
-                    "PERR_USER_INPUT_ERROR");
-        }
-
-        if ($assum_file_exists === true)
-            $file_exists = true;
-        else
-            $file_exists = $this->fileExists($path, $rescname);
-
-        if (($error_if_exists) && ($file_exists === true)) {
-            throw new RODSException("RODSConn::openFileDesc() expect file '$path' dose not exists with mode '$mode', but the file does exists",
-                "PERR_USER_INPUT_ERROR");
-        }
-
-
-        if (($create_if_not_exists) && ($file_exists === false)) // create new file
-        {
-            $keyValPair_pk = new RP_KeyValPair(2, array("rescName", "dataType"),
-                array("$rescname", "$filetype"));
-            $dataObjInp_pk = new RP_DataObjInp($path, $cmode, $open_flag, 0, -1, 0, 0,
-                $keyValPair_pk);
-            $api_num = $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_CREATE_AN'];
-        } else // open existing file
-        {
-            // open the file and get descriptor
-            if (isset($rescname)) {
-                $keyValPair_pk = new RP_KeyValPair(1, array("rescName"),
-                    array("$rescname"));
-                $dataObjInp_pk = new RP_DataObjInp
-                ($path, 0, $open_flag, 0, -1, 0, 0, $keyValPair_pk);
-            } else {
-                $dataObjInp_pk = new RP_DataObjInp
-                ($path, 0, $open_flag, 0, -1, 0, 0);
-            }
-            $api_num = $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_OPEN_AN'];
-        }
-
-        $msg = new RODSMessage("RODS_API_REQ_T", $dataObjInp_pk, $api_num);
-        fwrite($this->conn, $msg->pack()); // send it
-        // get value back
-        $msg = new RODSMessage();
-        $intInfo = (int)$msg->unpack($this->conn);
-        if ($intInfo < 0) {
-            if (RODSException::rodsErrCodeToAbbr($intInfo) == 'CAT_NO_ROWS_FOUND') {
-                throw new RODSException("trying to open a file '$path' " .
-                        "which does not exists with mode '$mode' ",
-                    "PERR_USER_INPUT_ERROR");
-            }
-            throw new RODSException("RODSConn::openFileDesc has got an error from the server",
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-        $l1desc = $intInfo;
-
-        if ($seek_to_end_of_file === true) {
-            $position = $this->fileSeek($l1desc, 0, SEEK_END);
-        }
-
-        return $l1desc;
-    }
-
-    /**
-     * unlink the file on server
-     * @param string $path path of the file
-     * @param string $rescname resource name. Not required if there is no other replica.
-     * @param boolean $force flag (true or false) indicating whether force delete or not.
-     *
-     */
-    public function fileUnlink($path, $rescname = NULL, $force = false)
-    {
-        $options = array();
-        if (isset($rescname)) {
-            $options['rescName'] = $rescname;
-        }
-        if ($force == true) {
-            $options['forceFlag'] = "";
-        }
-
-        if (!empty($options)) {
-            $options_pk = new RP_KeyValPair();
-            $options_pk->fromAssocArray($options);
-            $dataObjInp_pk = new RP_DataObjInp
-            ($path, 0, 0, 0, -1, 0, 0, $options_pk);
-        } else {
-            $dataObjInp_pk = new RP_DataObjInp
-            ($path, 0, 0, 0, -1, 0, 0);
-        }
-
-        $msg = new RODSMessage("RODS_API_REQ_T", $dataObjInp_pk,
-            $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_UNLINK_AN']);
-        fwrite($this->conn, $msg->pack()); // send it
-        // get value back
-        $msg = new RODSMessage();
-        $intInfo = (int)$msg->unpack($this->conn);
-        if ($intInfo < 0) {
-            if (RODSException::rodsErrCodeToAbbr($intInfo) == 'CAT_NO_ROWS_FOUND') {
-                throw new RODSException("trying to unlink a file '$path' " .
-                        "which does not exists",
-                    "PERR_USER_INPUT_ERROR");
-            }
-            throw new RODSException("RODSConn::fileUnlink has got an error from the server",
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-    }
-
-    /**
-     * close the input file descriptor on RODS server.
-     *
-     * @param int $l1desc level 1 file descriptor
-     */
-    public function closeFileDesc($l1desc)
-    {
-        try {
-            $dataObjCloseInp_pk = new RP_dataObjCloseInp($l1desc);
-            $msg = new RODSMessage("RODS_API_REQ_T", $dataObjCloseInp_pk,
-                $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_CLOSE_AN']);
-            fwrite($this->conn, $msg->pack()); // send it
-            // get value back
-            $msg = new RODSMessage();
-            $intInfo = (int)$msg->unpack($this->conn);
-            if ($intInfo < 0) {
-                trigger_error("Got an error from server:$intInfo",
-                    E_USER_WARNING);
-            }
-        } catch (RODSException $e) {
-            trigger_error("Got an exception:$e", E_USER_WARNING);
-        }
-    }
-
-    /**
-     * reads up to length bytes from the file pointer referenced by handle. Reading stops when up to length bytes have been read, EOF (end of file) is reached
-     *
-     * @param int $l1desc level 1 file descriptor
-     * @param int $length up to how many bytes to read.
-     * @return the read string.
-     */
-    public function fileRead($l1desc, $length)
-    {
-        $dataObjReadInp_pk = new RP_dataObjReadInp($l1desc, $length);
-        $msg = new RODSMessage("RODS_API_REQ_T", $dataObjReadInp_pk,
-            $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_READ_AN']);
-        fwrite($this->conn, $msg->pack()); // send it
-        $msg = new RODSMessage();
-        $intInfo = (int)$msg->unpack($this->conn);
-        if ($intInfo < 0) {
-            throw new RODSException("RODSConn::fileRead has got an error from the server",
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-        return $msg->getBinstr();
-    }
-
-    /**
-     * writes up to length bytes from the file pointer referenced by handle. returns number of bytes writtne.
-     *
-     * @param int $l1desc level 1 file descriptor
-     * @param string $string contents (binary safe) to be written
-     * @param int $length up to how many bytes to read.
-     * @return the number of bytes written.
-     */
-    public function fileWrite($l1desc, $string, $length = NULL)
-    {
-        if (!isset($length))
-            $length = strlen($string);
-
-        $dataObjWriteInp_pk = new RP_dataObjWriteInp($l1desc, $length);
-        $msg = new RODSMessage("RODS_API_REQ_T", $dataObjWriteInp_pk,
-            $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_WRITE_AN'], $string);
-        fwrite($this->conn, $msg->pack()); // send header and body msg
-        fwrite($this->conn, $string); // send contents
-        $msg = new RODSMessage();
-        $intInfo = (int)$msg->unpack($this->conn);
-        if ($intInfo < 0) {
-            throw new RODSException("RODSConn::fileWrite has got an error from the server",
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-        return $intInfo;
-    }
-
-    /**
-     *  Sets the file position indicator for the file referenced by l1desc (int descriptor). The new position, measured in bytes from the beginning of the file, is obtained by adding offset to the position specified by whence, whose values are defined as follows:
-     *  SEEK_SET - Set position equal to offset bytes.
-     *  SEEK_CUR - Set position to current location plus offset.
-     *  SEEK_END - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.)
-     *  If whence is not specified, it is assumed to be SEEK_SET.
-     * @return int the current offset
-     */
-    public function fileSeek($l1desc, $offset, $whence = SEEK_SET)
-    {
-        $dataObjReadInp_pk = new RP_fileLseekInp($l1desc, $offset, $whence);
-        $msg = new RODSMessage("RODS_API_REQ_T", $dataObjReadInp_pk,
-            $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_LSEEK_AN']);
-        fwrite($this->conn, $msg->pack()); // send it
-        $msg = new RODSMessage();
-        $intInfo = (int)$msg->unpack($this->conn);
-        if ($intInfo < 0) {
-            throw new RODSException("RODSConn::fileSeek has got an error from the server",
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-        $retpk = $msg->getBody();
-        return $retpk->offset;
-    }
-
-    /**
-     * Get metadata for a file, dir, resource or user
-     * @param char $pathtype 'd'=file, 'c'=dir, 'r'=resource, 'u'=user
-     * @param string $name name of the target object. in the case of file and dir, use its full path
-     * @return RODSMeta $meta meta data for the target.
-     */
-    public function getMeta($pathtype, $name)
-    {
-        switch ($pathtype) {
-            case 'd':
-                $select = array("COL_META_DATA_ATTR_NAME", "COL_META_DATA_ATTR_VALUE",
-                    "COL_META_DATA_ATTR_UNITS", 'COL_META_DATA_ATTR_ID');
-                $condition = array(
-                    new RODSQueryCondition("COL_COLL_NAME", dirname($name)),
-                    new RODSQueryCondition("COL_DATA_NAME", basename($name))
-                );
-                break;
-            case 'c':
-                $select = array("COL_META_COLL_ATTR_NAME", "COL_META_COLL_ATTR_VALUE",
-                    "COL_META_COLL_ATTR_UNITS", 'COL_META_COLL_ATTR_ID');
-                $condition = array(new RODSQueryCondition("COL_COLL_NAME", $name));
-                break;
-            case 'r':
-                $select = array("COL_META_RESC_ATTR_NAME", "COL_META_RESC_ATTR_VALUE",
-                    "COL_META_RESC_ATTR_UNITS", 'COL_META_RESC_ATTR_ID');
-                $condition = array(new RODSQueryCondition("COL_R_RESC_NAME", $name));
-                break;
-            case 'u':
-                $select = array("COL_META_USER_ATTR_NAME", "COL_META_USER_ATTR_VALUE",
-                    "COL_META_USER_ATTR_UNITS", 'COL_META_USER_ATTR_ID');
-                $condition = array(new RODSQueryCondition("COL_USER_NAME", $name));
-                break;
-            default:
-                throw new RODSException("RODSConn::getMeta pathtype '$pathtype' is not supported!",
-                    'PERR_USER_INPUT_ERROR');
-        }
-
-        $genque_result = $this->genQuery($select, $condition);
-
-        if ($genque_result === false) {
-            return array();
-        }
-        $ret_array = array();
-        for ($i = 0; $i < count($genque_result[$select[0]]); $i++) {
-            $ret_array[$i] = new RODSMeta(
-                $genque_result[$select[0]][$i],
-                $genque_result[$select[1]][$i],
-                $genque_result[$select[2]][$i],
-                $genque_result[$select[3]][$i]
-            );
-
-        }
-        return $ret_array;
-
-    }
-
-    /**
-     * Add metadata to a file, dir, resource or user
-     * @param char $pathtype 'd'=file, 'c'=dir, 'r'=resource, 'u'=user
-     * @param string $name name of the target object. in the case of file and dir, use its full path
-     * @param RODSMeta $meta meta data to be added.
-     */
-    public function addMeta($pathtype, $name, RODSMeta $meta)
-    {
-        $pkt = new RP_ModAVUMetadataInp("add", "-$pathtype", $name, $meta->name,
-            $meta->value, $meta->units);
-        $msg = new RODSMessage("RODS_API_REQ_T", $pkt,
-            $GLOBALS['PRODS_API_NUMS']['MOD_AVU_METADATA_AN']);
-        fwrite($this->conn, $msg->pack()); // send it
-        $msg = new RODSMessage();
-        $intInfo = (int)$msg->unpack($this->conn);
-        if ($intInfo < 0) {
-            throw new RODSException("RODSConn::addMeta has got an error from the server",
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-    }
-
-    /**
-     * remove metadata to a file, dir, resource or user
-     * @param char $pathtype 'd'=file, 'c'=dir, 'r'=resource, 'u'=user
-     * @param string $name name of the target object. in the case of file and dir, use its full path
-     * @param RODSMeta $meta meta data to be removed.
-     */
-    public function rmMeta($pathtype, $name, RODSMeta $meta)
-    {
-        $pkt = new RP_ModAVUMetadataInp("rm", "-$pathtype", $name, $meta->name,
-            $meta->value, $meta->units);
-        $msg = new RODSMessage("RODS_API_REQ_T", $pkt,
-            $GLOBALS['PRODS_API_NUMS']['MOD_AVU_METADATA_AN']);
-        fwrite($this->conn, $msg->pack()); // send it
-        $msg = new RODSMessage();
-        $intInfo = (int)$msg->unpack($this->conn);
-        if ($intInfo < 0) {
-            throw new RODSException("RODSConn::rmMeta has got an error from the server",
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-    }
-
-    /**
-     * remove metadata to a file, dir, resource or user
-     * @param char $pathtype 'd'=file, 'c'=dir, 'r'=resource, 'u'=user
-     * @param string $name name of the target object. in the case of file and dir, use its full path
-     * @param integer $metaid id of the metadata to be removed.
-     */
-    public function rmMetaByID($pathtype, $name, $metaid)
-    {
-        $pkt = new RP_ModAVUMetadataInp("rmi", "-$pathtype", $name, $metaid);
-        $msg = new RODSMessage("RODS_API_REQ_T", $pkt,
-            $GLOBALS['PRODS_API_NUMS']['MOD_AVU_METADATA_AN']);
-        fwrite($this->conn, $msg->pack()); // send it
-        $msg = new RODSMessage();
-        $intInfo = (int)$msg->unpack($this->conn);
-        if ($intInfo < 0) {
-            if (RODSException::rodsErrCodeToAbbr($intInfo) != 'CAT_SUCCESS_BUT_WITH_NO_INFO') {
-                throw new RODSException("RODSConn::rmMetaByID has got an error from the server",
-                    $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-            }
-        }
-    }
-
-    /**
-     * copy metadata between file, dir, resource or user
-     * @param char $pathtype_src source path type 'd'=file, 'c'=dir, 'r'=resource, 'u'=user
-     * @param char $pathtype_dest destination path type 'd'=file, 'c'=dir, 'r'=resource, 'u'=user
-     * @param string $name_src name of the source target object. in the case of file and dir, use its full path
-     * @param string $name_dest name of the destination target object. in the case of file and dir, use its full path
-     */
-    public function cpMeta($pathtype_src, $pathtype_dest, $name_src, $name_dest)
-    {
-        $pkt = new RP_ModAVUMetadataInp("cp", "-$pathtype_src",
-            "-$pathtype_dest", $name_src, $name_dest);
-        $msg = new RODSMessage("RODS_API_REQ_T", $pkt,
-            $GLOBALS['PRODS_API_NUMS']['MOD_AVU_METADATA_AN']);
-        fwrite($this->conn, $msg->pack()); // send it
-        $msg = new RODSMessage();
-        $intInfo = (int)$msg->unpack($this->conn);
-        if ($intInfo < 0) {
-            throw new RODSException("RODSConn::cpMeta has got an error from the server",
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-    }
-
-    /**
-     * Excute a user defined rule
-     * @param string $rule_body body of the rule. Read this tutorial for details about rules: http://www.irods.org/index.php/Executing_user_defined_rules/workflow
-     * @param array $inp_params associative array defining input parameter for micro services used in this rule. only string and keyval pair are supported at this time. If the array value is a string, then type is string, if the array value is an RODSKeyValPair object, it will be treated a keyval pair
-     * @param array $out_params an array of names (strings)
-     * @param array $remotesvr if this rule need to run at remote server, this associative array should have the following keys:
-     *    - 'host' remote host name or address
-     *    - 'port' remote port
-     *    - 'zone' remote zone
-     *    if any of the value is empty, this option will be ignored.
-     * @param RODSKeyValPair $options an RODSKeyValPair specifying additional options, purpose of this is unknown at the developement time. Leave it alone if you are as clueless as me...
-     * @return an associative array. Each array key is the lable, and each array value's type will depend on the type of $out_param, at this moment, only string and RODSKeyValPair are supported
-     */
-    public function execUserRule($rule_body,
-                                 array $inp_params = array(), array $out_params = array(),
-                                 array $remotesvr = array(), RODSKeyValPair $options = null)
-    {
-        $inp_params_packets = array();
-        foreach ($inp_params as $inp_param_key => $inp_param_val) {
-            if (is_a($inp_param_val, 'RODSKeyValPair')) {
-                $inp_params_packets[] = new RP_MsParam($inp_param_key,
-                    $inp_param_val->makePacket());
-            } else // a string
-            {
-                $inp_params_packets[] = new RP_MsParam($inp_param_key,
-                    new RP_STR($inp_param_val));
-            }
-        }
-        $inp_param_arr_packet = new RP_MsParamArray($inp_params_packets);
-
-        $out_params_desc = implode('%', $out_params);
-
-        if ((isset($remotesvr['host'])) && (isset($remotesvr['port'])) &&
-            (isset($remotesvr['zone']))
-        ) {
-            $remotesvr_packet = new RP_RHostAddr($remotesvr['host'],
-                $remotesvr['zone'], $remotesvr['port']);
-        } else {
-            $remotesvr_packet = new RP_RHostAddr();
-        }
-
-        if (!isset($options))
-            $options = new RODSKeyValPair();
-
-        $options_packet = $options->makePacket();
-
-        $pkt = new RP_ExecMyRuleInp($rule_body, $remotesvr_packet,
-            $options_packet, $out_params_desc, $inp_param_arr_packet);
-        $msg = new RODSMessage("RODS_API_REQ_T", $pkt,
-            $GLOBALS['PRODS_API_NUMS']['EXEC_MY_RULE_AN']);
-        fwrite($this->conn, $msg->pack()); // send it
-        $resv_msg = new RODSMessage();
-        $intInfo = (int)$resv_msg->unpack($this->conn);
-        if ($intInfo < 0) {
-            throw new RODSException("RODSConn::execUserRule has got an error from the server",
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-        $retpk = $resv_msg->getBody();
-        $param_array = $retpk->MsParam_PI;
-        $ret_arr = array();
-        foreach ($param_array as $param) {
-            if ($param->type == 'STR_PI') {
-                $label = $param->label;
-                $ret_arr["$label"] = $param->STR_PI->myStr;
-            } else
-                if ($param->type == 'KeyValPair_PI') {
-                    $label = $param->label;
-                    $ret_arr["$label"] = RODSKeyValPair::fromPacket($param->KeyValPair_PI);
-                } else
-                    if ($param->type == 'ExecCmdOut_PI') {
-                        $label = $param->label;
-                        $exec_ret_val = $param->ExecCmdOut_PI->buf;
-                        $ret_arr["$label"] = $exec_ret_val;
-                    } else {
-                        throw new RODSException("RODSConn::execUserRule got. " .
-                                "an unexpected output param with type: '$param->type' \n",
-                            "PERR_UNEXPECTED_PACKET_FORMAT");
-                    }
-        }
-        return $ret_arr;
-    }
-
-    /**
-     * This function is depreciated, and kept only for lagacy reasons!
-     * Makes a general query to RODS server. Think it as an SQL. "select foo from sometab where bar = '3'". In this example, foo is specified by "$select", bar and "= '3'" are speficed by condition.
-     * @param array $select the fields (names) to be returned/interested. There can not be more than 50 input fields. For example:"COL_COLL_NAME" means collection-name.
-     * @param array $condition  Array of RODSQueryCondition. All fields are defined in RodsGenQueryNum.inc.php
-     * @param array $condition_kw  Array of RODSQueryCondition. All fields are defined in RodsGenQueryKeyWd.inc.php
-     * @param integer $startingInx result start from which row.
-     * @param integer $maxresult up to how man rows should the result contain.
-     * @param boolean $getallrows whether to retreive all results
-     * @param boolean $select_attr attributes (array of int) of each select value. For instance, the attribute can be ORDER_BY (0x400) or ORDER_BY_DESC (0x800) to have the results sorted on the server. The default value is 1 for each attribute. Pass empty array or leave the option if you don't want anything fancy.
-     * @param integer $continueInx This index can be used to retrieve rest of results, when there is a overflow of the rows (> 500)
-     * @return an associated array, keys are the returning field names, each value is an array of the field values. Also, it returns false (boolean), if no rows are found.
-     * Note: This function is very low level. It's not recommended for beginners.
-     */
-    public function genQuery(array $select, array $condition = array(),
-                             array $condition_kw = array(), $startingInx = 0, $maxresults = 500,
-                             $getallrows = true, array $select_attr = array(), &$continueInx = 0,
-                             &$total_num_rows = -1)
-    {
-        if (count($select) > 50) {
-            trigger_error("genQuery(): Only upto 50 input are supported, rest ignored",
-                E_USER_WARNING);
-            $select = array_slice($select, 0, 50);
-        }
-
-        $GenQueInp_options = 0;
-        if ($total_num_rows != -1) {
-            $GenQueInp_options = 1;
-        }
-
-        require_once("RodsGenQueryNum.inc.php"); //load magic numbers
-        require_once("RodsGenQueryKeyWd.inc.php"); //load magic numbers
-
-        // contruct select packet (RP_InxIvalPair $selectInp)
-        $select_pk = NULL;
-        if (count($select) > 0) {
-            if (empty($select_attr))
-                $select_attr = array_fill(0, count($select), 1);
-            $idx = array();
-            foreach ($select as $selval) {
-                if (isset($GLOBALS['PRODS_GENQUE_NUMS']["$selval"]))
-                    $idx[] = $GLOBALS['PRODS_GENQUE_NUMS']["$selval"];
-                else
-                    trigger_error("genQuery(): select val '$selval' is not support, ignored",
-                        E_USER_WARNING);
-            }
-
-            $select_pk = new RP_InxIvalPair(count($select), $idx, $select_attr);
-        } else {
-            $select_pk = new RP_InxIvalPair();
-        }
-
-        foreach ($condition_kw as &$cond_kw) {
-            if (isset($GLOBALS['PRODS_GENQUE_KEYWD'][$cond_kw->name]))
-                $cond_kw->name = $GLOBALS['PRODS_GENQUE_KEYWD'][$cond_kw->name];
-        }
-
-        foreach ($condition as &$cond) {
-            if (isset($GLOBALS['PRODS_GENQUE_NUMS'][$cond->name]))
-                $cond->name = $GLOBALS['PRODS_GENQUE_NUMS'][$cond->name];
-        }
-
-        $condInput = new RP_KeyValPair();
-        $condInput->fromRODSQueryConditionArray($condition_kw);
-
-        $sqlCondInp = new RP_InxValPair();
-        $sqlCondInp->fromRODSQueryConditionArray($condition);
-
-        // construct RP_GenQueryInp packet
-        $genque_input_pk = new RP_GenQueryInp($maxresults, $continueInx, $condInput,
-            $select_pk, $sqlCondInp, $GenQueInp_options, $startingInx);
-
-        // contruce a new API request message, with type GEN_QUERY_AN
-        $msg = new RODSMessage("RODS_API_REQ_T", $genque_input_pk,
-            $GLOBALS['PRODS_API_NUMS']['GEN_QUERY_AN']);
-        fwrite($this->conn, $msg->pack()); // send it
-        // get value back
-        $msg_resv = new RODSMessage();
-        $intInfo = $msg_resv->unpack($this->conn);
-        if ($intInfo < 0) {
-            if (RODSException::rodsErrCodeToAbbr($intInfo) == 'CAT_NO_ROWS_FOUND') {
-                return false;
-            }
-
-            throw new RODSException("RODSConn::genQuery has got an error from the server",
-                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-        }
-        $genque_result_pk = $msg_resv->getBody();
-
-        $result_arr = array();
-        for ($i = 0; $i < $genque_result_pk->attriCnt; $i++) {
-            $sql_res_pk = $genque_result_pk->SqlResult_PI[$i];
-            $attri_name = $GLOBALS['PRODS_GENQUE_NUMS_REV'][$sql_res_pk->attriInx];
-            $result_arr["$attri_name"] = $sql_res_pk->value;
-        }
-        if ($total_num_rows != -1)
-            $total_num_rows = $genque_result_pk->totalRowCount;
-
-
-        $more_results = true;
-        // if there are more results to be fetched
-        while (($genque_result_pk->continueInx > 0) && ($more_results === true)
-            && ($getallrows === true)) {
-            $msg->getBody()->continueInx = $genque_result_pk->continueInx;
-            fwrite($this->conn, $msg->pack()); // re-send it with new continueInx
-            // get value back
-            $msg_resv = new RODSMessage();
-            $intInfo = $msg_resv->unpack($this->conn);
-            if ($intInfo < 0) {
-                if (RODSException::rodsErrCodeToAbbr($intInfo) == 'CAT_NO_ROWS_FOUND') {
-                    $more_results = false;
-                    break;
-                } else
-                    throw new RODSException("RODSConn::genQuery has got an error from the server",
-                        $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-            }
-            $genque_result_pk = $msg_resv->getBody();
-
-            for ($i = 0; $i < $genque_result_pk->attriCnt; $i++) {
-                $sql_res_pk = $genque_result_pk->SqlResult_PI[$i];
-                $attri_name = $GLOBALS['PRODS_GENQUE_NUMS_REV'][$sql_res_pk->attriInx];
-                $result_arr["$attri_name"] =
-                    array_merge($result_arr["$attri_name"], $sql_res_pk->value);
-            }
-        }
-        
-         // Make sure and close the query if there are any results left.
-    if ($genque_result_pk->continueInx > 0) 
-    {
-      $msg->getBody()->continueInx=$genque_result_pk->continueInx;
-      $msg->getBody()->maxRows=-1;  // tells the server to close the query
-      fwrite($this->conn, $msg->pack());
-      $msg_resv=new RODSMessage();
-      $intInfo=$msg_resv->unpack($this->conn);
-      if ($intInfo<0)
-      {
-        throw new RODSException("RODSConn::genQuery has got an error from the server",
-          $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-      }
-    }
-
-        return $result_arr;
-    }
-
-    /**
-     * Makes a general query to RODS server. Think it as an SQL. "select foo from sometab where bar = '3'". In this example, foo is specified by "$select", bar and "= '3'" are speficed by condition.
-     * @param RODSGenQueSelFlds $select the fields (names) to be returned/interested. There can not be more than 50 input fields. For example:"COL_COLL_NAME" means collection-name.
-     * @param RODSGenQueConds $condition  All fields are defined in RodsGenQueryNum.inc.php and RodsGenQueryKeyWd.inc.php
-     * @param integer $start result start from which row.
-     * @param integer $limit up to how many rows should the result contain. If -1 is passed, all available rows will be returned
-     * @return RODSGenQueResults
-     * Note: This function is very low level. It's not recommended for beginners.
-     */
-    public function query(RODSGenQueSelFlds $select, RODSGenQueConds $condition,
-                          $start = 0, $limit = -1)
-    {
-        if (($select->getCount() < 1) || ($select->getCount() > 50)) {
-            throw new RODSException("Only 1-50 fields are supported",
-                'PERR_USER_INPUT_ERROR');
-        }
-
-        // contruct select packet (RP_InxIvalPair $selectInp), and condition packets
-        $select_pk = $select->packetize();
-        $cond_pk = $condition->packetize();
-        $condkw_pk = $condition->packetizeKW();
-
-        // determin max number of results per query
-            if (($limit > 0) && ($limit < 500))
-                $max_result_per_query = $limit;
-            else
-                $max_result_per_query = 500;
-
-        $num_fetched_rows = 0;
-        $continueInx = 0;
-        $results = new RODSGenQueResults();
-        do {
-            // construct RP_GenQueryInp packet
-            $options = 1 | $GLOBALS['PRODS_GENQUE_NUMS']['RETURN_TOTAL_ROW_COUNT'];
-            $genque_input_pk = new RP_GenQueryInp($max_result_per_query,
-                $continueInx, $condkw_pk, $select_pk, $cond_pk, $options, $start);
-
-            // contruce a new API request message, with type GEN_QUERY_AN
-            $msg = new RODSMessage("RODS_API_REQ_T", $genque_input_pk,
-                $GLOBALS['PRODS_API_NUMS']['GEN_QUERY_AN']);
-            fwrite($this->conn, $msg->pack()); // send it
-            // get value back
-            $msg_resv = new RODSMessage();
-            $intInfo = $msg_resv->unpack($this->conn);
-            if ($intInfo < 0) {
-                if (RODSException::rodsErrCodeToAbbr($intInfo) == 'CAT_NO_ROWS_FOUND') {
-                    break;
-                }
-
-                throw new RODSException("RODSConn::query has got an error from the server",
-                    $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-            }
-            $genque_result_pk = $msg_resv->getBody();
-            $num_row_added = $results->addResults($genque_result_pk);
-            $continueInx = $genque_result_pk->continueInx;
-            $start = $start + $results->getNumRow();
-        } while (($continueInx > 0) &&
-            (($results->getNumRow() < $limit) || ($limit < 0)));
-    
-
-        // Make sure and close the query if there are any results left.
-    if ($continueInx > 0) 
-    {
-      $msg->getBody()->continueInx=$continueInx;
-      $msg->getBody()->maxRows=-1;  // tells the server to close the query
-      fwrite($this->conn, $msg->pack());
-      $msg_resv=new RODSMessage();
-      $intInfo=$msg_resv->unpack($this->conn);
-      if ($intInfo<0)
-      {
-        throw new RODSException("RODSConn::query has got an error from the server",
-          $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
-      }
-    }
-        
-        return $results;
-    }
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php
deleted file mode 100644
index b3e8155da4..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**#@+
- * Constants
- */
-/**
- * Maximum number of connection per user per server
- */
-define("MAX_NUM_CONN_PER_USER_SERVER", 5);
-/**#@-*/
-
-
-if (!isset($GLOBALS['RODSConnManager']))
-    $GLOBALS['RODSConnManager'] = new RODSConnManager();
-
-
-class RODSConnManager
-{
-    private $waiting_queue;
-    private $conn_map;
-
-    public function __construct()
-    {
-        $this->waiting_queue = array();
-        $this->conn_map = array();
-    }
-
-    public static function getConn(RODSAccount $account)
-    {
-        $manager = $GLOBALS['RODSConnManager'];
-
-        $conn = new RODSConn($account);
-        $conn_sig = $conn->getSignature();
-        if (!isset($manager->conn_map[$conn_sig]))
-            $manager->conn_map[$conn_sig] = array();
-
-        //check if there is any opened connection idle
-        foreach ($manager->conn_map[$conn_sig] as &$opened_conn) {
-            if ($opened_conn->isIdle()) {
-                //$opened_conn->lock();
-                $account = $opened_conn->getAccount(); //update account if needed...
-                return $opened_conn;
-            }
-        }
-
-        //check if there is any more new connection allowed
-        if (count($manager->conn_map[$conn_sig]) < MAX_NUM_CONN_PER_USER_SERVER) {
-            $conn->connect();
-            $id = count($manager->conn_map[$conn_sig]);
-            $manager->conn_map[$conn_sig][$id] = $conn;
-            $conn->setId($id);
-            //$conn->lock();
-            $account = $conn->getAccount(); //update account if needed...
-            return $conn;
-        }
-
-        //because PHP doesn't support multithread, if we run out of connections,
-        //there is probably something went wrong.
-        throw new RODSException("Unexpectedly ran out of connections. Maybe some connections are not released??? ",
-            "PERR_INTERNAL_ERR");
-
-        //if no connection are available, sleep for 100ms and retry
-        usleep(100);
-        echo "i am sleeping... <br/> \n";
-        return RODSConnManager::getConn($account);
-    }
-
-    public static function releaseConn(RODSConn $conn)
-    {
-        $manager = $GLOBALS['RODSConnManager'];
-        $conn_sig = $conn->getSignature();
-
-        //echo "id:".$conn->getId()." ".implode(",",array_keys($manager->conn_map[$conn_sig]))."<br/>\n";
-
-        if (isset($manager->conn_map[$conn_sig][$conn->getId()])) {
-            $manager->conn_map[$conn_sig][$conn->getId()]->unlock();
-        }
-    }
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSDirStats.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSDirStats.class.php
deleted file mode 100644
index 16d24584f4..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSDirStats.class.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-class RODSDirStats
-{
-    public $name;
-    public $owner;
-    public $ownerzone;
-    public $mtime;
-    public $ctime;
-    public $id;
-    public $comments;
-
-    public function __construct($name, $owner, $ownerzone, $mtime, $ctime, $id, $comments)
-    {
-        $this->name = $name;
-        $this->owner = $owner;
-        $this->ownerzone = $ownerzone;
-        $this->mtime = $mtime;
-        $this->ctime = $ctime;
-        $this->id = $id;
-        $this->comments = $comments;
-    }
-
-}  
-     
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php
deleted file mode 100644
index 97116a102c..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/**
- * RODS exception class
- * @author Sifang Lu <sifang@sdsc.edu>
- * @copyright Copyright &copy; 2007, TBD
- * @package Prods
- */
-
-$errtable_file = dirname(__FILE__) . "/RodsErrorTable.inc.php";
-
-if (is_readable($errtable_file))
-    require_once($errtable_file);
-else
-    die("Could not read file $errtable_file <br/>\n");
-
-/**
- * custom exception class for RODS
- */
-class RODSException extends Exception
-{
-    private $code_abbr;
-    private $cause;
-
-    /**
-     * Makes a new RODS excption
-     * @param string $message err/exception message
-     * @param string $code_abbr error code abbreviation
-     */
-    public function __construct($message, $code_abbr = "UNKNOWN_PRODS_ERR",
-                                Exception $cause = NULL)
-    {
-        $this->code_abbr = $code_abbr;
-        $this->cause = $cause;
-
-        parent::__construct($message, $GLOBALS['PRODS_ERR_CODES'][$code_abbr]);
-    }
-
-    public function getCause()
-    {
-        return $this->cause;
-    }
-
-    public function getCodeAbbr()
-    {
-        return $this->code_abbr;
-    }
-
-    public static function rodsErrCodeToAbbr($code)
-    {
-        if (isset($GLOBALS['PRODS_ERR_CODES_REV']["$code"]))
-            return $GLOBALS['PRODS_ERR_CODES_REV']["$code"];
-        else
-            return null;
-    }
-
-    public static function rodsErrAbbrToCode($codeabbr)
-    {
-        if (isset($GLOBALS['PRODS_ERR_CODES']["$codeabbr"]))
-            return $GLOBALS['PRODS_ERR_CODES']["$codeabbr"];
-        else
-            return null;
-    }
-
-    public function getStackTrace()
-    {
-        if ($this->cause !== null) {
-            $arr = array();
-            $trace = $this->getTrace();
-            array_push($arr, $trace[0]);
-            unset($trace);
-            if (get_class($this->cause) == "RODSException") {
-                foreach ($this->cause->getStackTrace() as $key => $trace) {
-                    array_push($arr, $trace);
-                }
-            } else {
-                foreach ($this->cause->getTrace() as $key => $trace) {
-                    array_push($arr, $trace);
-                }
-            }
-            return $arr;
-        } else {
-            return $this->getTrace();
-        }
-    }
-
-    public function showStackTrace()
-    {
-        $htmldoc = "<p style=\"font-family: monospace; border: solid 1px #000000\"><span style=\"font-weight: bold; color: #000000;\">An exception was thrown :<br/></span>";
-        $htmldoc .= "Exception code : $this->code<br/>";
-        $htmldoc .= "Exception abbr : $this->code_abbr<br/>";
-        $htmldoc .= "Exception message : $this->message<br/>";
-        $htmldoc .= "<span style=\"color: #0000FF;\">";
-        $i = 0;
-        foreach ($this->getStackTrace() as $key => $trace) {
-            $htmldoc .= $this->showTrace($trace, $i);
-            $i++;
-        }
-        $htmldoc .= "#$i {main}<br/>";
-        unset($i);
-        $htmldoc .= "</span></p>";
-        return $htmldoc;
-    }
-
-    private function showTrace($_trace, $_i)
-    {
-        $htmldoc = "#$_i ";
-        if (array_key_exists("file", $_trace)) {
-            $htmldoc .= $_trace["file"];
-        }
-        if (array_key_exists("line", $_trace)) {
-            $htmldoc .= "(" . $_trace["line"] . "): ";
-        }
-        if (array_key_exists("class", $_trace) && array_key_exists("type", $_trace)) {
-            $htmldoc .= $_trace["class"] . $_trace["type"];
-        }
-        if (array_key_exists("function", $_trace)) {
-            $htmldoc .= $_trace["function"] . "(";
-            if (array_key_exists("args", $_trace)) {
-                if (count($_trace["args"]) > 0) {
-                    $args = $_trace["args"];
-                    $type = gettype($args[0]);
-                    $value = $args[0];
-                    unset($args);
-                    if ($type == "boolean") {
-                        if ($value) {
-                            $htmldoc .= "true";
-                        } else {
-                            $htmldoc .= "false";
-                        }
-                    } elseif ($type == "integer" || $type == "double") {
-                        if (settype($value, "string")) {
-                            if (strlen($value) <= 20) {
-                                $htmldoc .= $value;
-                            } else {
-                                $htmldoc .= substr($value, 0, 17) . "...";
-                            }
-                        } else {
-                            if ($type == "integer") {
-                                $htmldoc .= "? integer ?";
-                            } else {
-                                $htmldoc .= "? double or float ?";
-                            }
-                        }
-                    } elseif ($type == "string") {
-                        if (strlen($value) <= 18) {
-                            $htmldoc .= "'$value'";
-                        } else {
-                            $htmldoc .= "'" . substr($value, 0, 15) . "...'";
-                        }
-                    } elseif ($type == "array") {
-                        $htmldoc .= "Array";
-                    } elseif ($type == "object") {
-                        $htmldoc .= "Object";
-                    } elseif ($type == "resource") {
-                        $htmldoc .= "Resource";
-                    } elseif ($type == "NULL") {
-                        $htmldoc .= "null";
-                    } elseif ($type == "unknown type") {
-                        $htmldoc .= "? unknown type ?";
-                    }
-                    unset($type);
-                    unset($value);
-                }
-                if (count($_trace["args"]) > 1) {
-                    $htmldoc .= ",...";
-                }
-            }
-            $htmldoc .= ")<br/>";
-        }
-        return $htmldoc;
-    }
-
-    /**
-     * Magic function to turn exception obj to a string
-     */
-    public function __toString()
-    {
-        return __CLASS__ . ": [{$this->code} $this->code_abbr]: {$this->message}\n";
-        //return $this->showStackTrace();
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSFileStats.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSFileStats.class.php
deleted file mode 100644
index 6452c2b1e5..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSFileStats.class.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-class RODSFileStats
-{
-    public $name;
-    public $size;
-    public $owner;
-    public $ownerzone;
-    public $mtime;
-    public $ctime;
-    public $id;
-    public $typename;
-    public $rescname;
-    public $comments;
-    public $num_replica;
-
-    public function __construct($name, $size, $owner, $ownerzone, $mtime, $ctime, $id, $typename,
-                                $rescname, $comments, $num_replica = null)
-    {
-        $this->name = $name;
-        $this->size = $size;
-        $this->owner = $owner;
-        $this->ownerzone = $ownerzone;
-        $this->mtime = $mtime;
-        $this->ctime = $ctime;
-        $this->id = $id;
-        $this->typename = $typename;
-        $this->rescname = $rescname;
-        $this->comments = $comments;
-        $this->num_replica = $num_replica;
-    }
-
-}  
-     
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php
deleted file mode 100644
index 4bc10cc549..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-require_once("autoload.inc.php");
-class RODSGenQueConds
-{
-    private $cond;
-    private $cond_kw;
-
-    /**
-     * default constructor. It take names, ops, and vals.
-     * suppose name='foo' op='>=' and val='0', then the triplex means
-     * "foo >= 0" as one iRODS general query condition.
-     * @param array (of string) $names names of the field, which must be one defined in file 'RodsGenQueryNum.inc.php'.
-     * @param array (of string) $ops logical operator, such as '=' 'like' '>'
-     * @param array (of string) $vals value of the filed
-     */
-    public function __construct(array $names = array(), array $ops = array(),
-                                array $vals = array())
-    {
-        require_once("RodsGenQueryNum.inc.php"); //load magic numbers
-        require_once("RodsGenQueryKeyWd.inc.php"); //load magic keywords
-
-        $this->cond = array('names' => array(), 'sysnames' => array(), 'values' => array());
-        $this->cond_kw = array('names' => array(), 'sysnames' => array(), 'values' => array());
-
-        for ($i = 0; $i < count($names); $i++) {
-            $name = $names[$i];
-            $op = $ops[$i];
-            $val = $vals[$i];
-            if (isset($GLOBALS['PRODS_GENQUE_NUMS']["$name"])) {
-                $this->cond['names'][] = $name;
-                $this->cond['sysnames'][] = $GLOBALS['PRODS_GENQUE_NUMS']["$name"];
-                $this->cond['values'][] = "$op '$val'";
-            } else
-                if (isset($GLOBALS['PRODS_GENQUE_KEYWD']["$name"])) {
-                    $this->cond_kw['names'][] = $name;
-                    $this->cond_kw['sysnames'][] = $GLOBALS['PRODS_GENQUE_KEYWD']["$name"];
-                    $this->cond_kw['values'][] = "$op '$val'";
-                } else {
-                    throw new RODSException("General Query condition field name '$name' is not valid",
-                        'PERR_USER_INPUT_ERROR');
-                }
-        }
-    }
-
-    /**
-     * Add a single select field.
-     * @param string $name names of the field, which must be one defined in file 'RodsGenQueryNum.inc.php'.
-     * @param string $op logical operator, such as '=' 'like' '>'
-     * @param string $val value of the filed
-     * @param array  an array of tuples of extra op's and val's, each tuple is an assosive array that has key 'op' and 'val'. These conditions will be 'OR' with the other conditions.
-     * for example add ('COL_D_DATA_ID','like', '/tempZone/home/rods/%', array(array('op'=>'=','val'=>'/tempZone/home/rods'")))
-     * would select all file ids both in subdirectories under '/tempZone/home/rods' and directly under '/tempZone/home/rods'
-     */
-    public function add($name, $op, $val, array $OR_ops_vals = array())
-    {
-        require_once("RodsGenQueryNum.inc.php"); //load magic numbers
-        require_once("RodsGenQueryKeyWd.inc.php"); //load magic keywords
-
-        if (isset($GLOBALS['PRODS_GENQUE_NUMS']["$name"])) {
-            $this->cond['names'][] = $name;
-            $this->cond['sysnames'][] = $GLOBALS['PRODS_GENQUE_NUMS']["$name"];
-            $value = "$op '$val'";
-            foreach ($OR_ops_vals as $op_val) {
-                $or_op = $op_val['op'];
-                $or_val = $op_val['val'];
-                if (empty($or_op) || empty($or_val))
-                    continue;
-                $value = $value . " || $or_op '$or_val'";
-            }
-            $this->cond['values'][] = $value;
-        } else
-            if (isset($GLOBALS['PRODS_GENQUE_KEYWD']["$name"])) {
-                $this->cond_kw['names'][] = $name;
-                $this->cond_kw['sysnames'][] = $GLOBALS['PRODS_GENQUE_KEYWD']["$name"];
-                $value = "$op '$val'";
-                foreach ($OR_ops_vals as $op_val) {
-                    $or_op = $op_val['op'];
-                    $or_val = $op_val['val'];
-                    if (empty($or_op) || empty($or_val))
-                        continue;
-                    $value = $value . " || $or_op '$or_val'";
-                }
-                $this->cond_kw['values'][] = $value;
-            } else {
-                throw new RODSException("General Query condition field name '$name' is not valid",
-                    'PERR_USER_INPUT_ERROR');
-            }
-    }
-
-    /**
-     * make a RP_InxValPair.
-     */
-    public function packetize()
-    {
-        return (new RP_InxValPair(count($this->cond['names']),
-            $this->cond['sysnames'], $this->cond['values']));
-    }
-
-    /**
-     * make a RP_KeyValPair.
-     */
-    public function packetizeKW()
-    {
-        return (new RP_KeyValPair(count($this->cond_kw['names']),
-            $this->cond_kw['sysnames'], $this->cond_kw['values']));
-    }
-
-    public function getCond()
-    {
-        return $this->cond;
-    }
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php
deleted file mode 100644
index 899b4f0e3b..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-require_once("autoload.inc.php");
-class RODSGenQueResults
-{
-    private $total_count;
-    private $values;
-    private $numcol;
-    private $numrow;
-
-    /**
-     * default constructor.
-     * @param integer $total_count total count of all potential results.
-     * @param array $result_array an associative array of the values. Each key is the return field name, and each array element is an array of values of the query.
-     */
-    public function __construct($total_count = 0, array $result_array = array())
-    {
-        $this->total_count = $total_count;
-        $this->values = $result_array;
-        $this->numcol = count($result_array);
-        if ($this->numcol > 0)
-            $this->numrow = count(current($result_array));
-        else
-            $this->numrow = 0;
-    }
-
-    /**
-     * Add general query result packet RP_GenQueryOut, directly from the protocol level query,  into the result structure.
-     * @param RP_GenQueryOut $genque_result_pk result packet directly from the protocol level query.
-     * @return number of rows just added
-     */
-    public function addResults(RP_GenQueryOut $genque_result_pk)
-    {
-        if ($genque_result_pk->totalRowCount > $this->total_count)
-            $this->total_count = $genque_result_pk->totalRowCount;
-
-        require_once("RodsGenQueryNum.inc.php"); //load magic numbers
-
-        $num_row_added = 0;
-        for ($i = 0; $i < $genque_result_pk->attriCnt; $i++) {
-            $sql_res_pk = $genque_result_pk->SqlResult_PI[$i];
-            $attri_name = $GLOBALS['PRODS_GENQUE_NUMS_REV'][$sql_res_pk->attriInx];
-            if (empty($this->values["$attri_name"]))
-                $this->values["$attri_name"] = $sql_res_pk->value;
-            else
-                array_splice($this->values["$attri_name"],
-                    count($this->values["$attri_name"]), 0, $sql_res_pk->value);
-            if ($i == 0) {
-                $num_row_added = count($sql_res_pk->value);
-                if ($num_row_added != (int)$genque_result_pk->rowCnt) {
-                    throw new RODSException("Gen Query result packet num row mismatch. Expect: $genque_result_pk->rowCnt, got: $num_row_added",
-                        'PERR_UNEXPECTED_PACKET_FORMAT');
-                }
-            }
-        }
-
-        $this->numcol = count($this->values);
-        if ($this->numcol > 0)
-            $this->numrow = count(current($this->values));
-        else
-            $this->numrow = 0;
-
-        return $num_row_added;
-    }
-
-    /**
-     * get result values in (2-d) array, each array key is the name
-     * used RODSGenQueSelFlds, such as COL_COLL_NAME
-     */
-    public function getValues()
-    {
-        return $this->values;
-    }
-
-    /**
-     * get total result count, including all the potential results not returned.
-     */
-    public function getTotalCount()
-    {
-        return $this->total_count;
-    }
-
-    /**
-     * get number of columns/fields of the results.
-     */
-    public function getNumCol()
-    {
-        return $this->numcol;
-    }
-
-    /**
-     * get number of rows of the results.
-     */
-    public function getNumRow()
-    {
-        return $this->numrow;
-    }
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php
deleted file mode 100644
index aa391613d0..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-require_once("autoload.inc.php");
-class RODSGenQueSelFlds
-{
-    private $names;
-    private $indexes;
-    private $attrs;
-
-    /**
-     * default constructor.
-     * @param string $name name of the field, which must be one defined in file 'RodsGenQueryNum.inc.php'.
-     * @param string $attrs extra options used for operations such as order_by, the expected values are:
-     * - 'order_by_asc' order the result by this field, in ASCENDING order
-     * - 'order_by_desc' order the result by this field, in DESCENDING order
-     * - min minimum of the group
-     * - max maximum of the group
-     * - sum sum of the group
-     * - avg average of the group
-     * - count count of the group
-     */
-    public function __construct(array $names = array(), array $attrs = array())
-    {
-        require_once("RodsGenQueryNum.inc.php"); //load magic numbers
-
-        $this->names = $names;
-        $this->attrs = array();
-        $this->indexes = array();
-
-        for ($i = 0; $i < count($names); $i++) {
-            $name = $names[$i];
-            if (!isset($GLOBALS['PRODS_GENQUE_NUMS']["$name"])) {
-                throw new RODSException("General Query select field name '$name' is not valid",
-                    'PERR_USER_INPUT_ERROR');
-            }
-            $this->indexes[] = $GLOBALS['PRODS_GENQUE_NUMS']["$name"];
-            $this->attrs[] = RODSGenQueSelFlds::attr2GenQueNumber($attrs[$i]);
-        }
-
-    }
-
-    /**
-     * Add a single select field.
-     *
-     * @param string name name of the field, which must be one defined in file 'RodsGenQueryNum.inc.php'.
-     */
-    public function add($name, $attr = NULL)
-    {
-        require_once("RodsGenQueryNum.inc.php"); //load magic numbers
-        if (!isset($GLOBALS['PRODS_GENQUE_NUMS']["$name"])) {
-            throw new RODSException("General Query select field name '$name' is not valid",
-                'PERR_USER_INPUT_ERROR');
-        }
-        $this->indexes[] = $GLOBALS['PRODS_GENQUE_NUMS']["$name"];
-        $this->names[] = $name;
-        $this->attrs[] = RODSGenQueSelFlds::attr2GenQueNumber($attr);
-    }
-
-    /**
-     * update a single select field's attr/value. Note that if the value already exists,
-     * it will OR the bits. This is used when you want more than one type of operation
-     * for a select field, such as select_max and sort.
-     */
-    public function update($name, $attr)
-    {
-        require_once("RodsGenQueryNum.inc.php"); //load magic numbers
-        if (!isset($GLOBALS['PRODS_GENQUE_NUMS']["$name"])) {
-            throw new RODSException("General Query select field name '$name' is not valid",
-                'PERR_USER_INPUT_ERROR');
-        }
-
-        $newattr = RODSGenQueSelFlds::attr2GenQueNumber($attr);
-        for ($i = 0; $i < count($this->names); $i++) {
-            if ($this->names[$i] == $name) {
-                if ($this->attrs[$i] == 1)
-                    $this->attrs[$i] = $newattr;
-                else
-                    $this->attrs[$i] = $newattr | $this->attrs[$i];
-                return;
-            }
-        }
-        $this->add($name, $attr);
-    }
-
-    /**
-     * Convert supported attribute to magic number, that iRODS protocol uses
-     * Following attributes are supported:
-     * - 'order_by_asc' order the result by this field, in ASCENDING order
-     * - 'order_by_desc' order the result by this field, in DESCENDING order
-     * - min minimum of the group
-     * - max maximum of the group
-     * - sum sum of the group
-     * - avg average of the group
-     * - count count of the group
-     */
-    public static function attr2GenQueNumber($attr)
-    {
-        if (empty($attr)) return 1;
-        $retval = 1;
-        switch ($attr) {
-            case 'order_by_asc':
-                $retval = $GLOBALS['PRODS_GENQUE_NUMS']['ORDER_BY'];
-                break;
-            case 'order_by_desc':
-                $retval = $GLOBALS['PRODS_GENQUE_NUMS']['ORDER_BY_DESC'];
-                break;
-            case 'min':
-                $retval = $GLOBALS['PRODS_GENQUE_NUMS']['SELECT_MIN'];
-                break;
-            case 'max':
-                $retval = $GLOBALS['PRODS_GENQUE_NUMS']['SELECT_MAX'];
-                break;
-            case 'sum':
-                $retval = $GLOBALS['PRODS_GENQUE_NUMS']['SELECT_SUM'];
-                break;
-            case 'avg':
-                $retval = $GLOBALS['PRODS_GENQUE_NUMS']['SELECT_AVG'];
-                break;
-            case 'count':
-                $retval = $GLOBALS['PRODS_GENQUE_NUMS']['SELECT_COUNT'];
-                break;
-            default:
-                throw new RODSException("Unexpected attribute: '$attr'",
-                    'PERR_USER_INPUT_ERROR');
-        }
-        return intval($retval);
-    }
-
-    /**
-     * make a RP_InxIvalPair, a low level iRODS packet
-     */
-    public function packetize()
-    {
-        return (new RP_InxIvalPair(count($this->names), $this->indexes,
-            $this->attrs));
-
-    }
-
-    public function getIndexes()
-    {
-        return $this->indexes;
-    }
-
-    public function getAttrs()
-    {
-        return $this->attrs;
-    }
-
-    public function getCount()
-    {
-        return count($this->names);
-    }
-
-    public function getNames()
-    {
-        return $this->names;
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php
deleted file mode 100644
index f347f7c988..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * RODS keyval type class. This class is conresponding to iRODS's keyval type
- * @author Sifang Lu <sifang@sdsc.edu>
- * @copyright Copyright &copy; 2007, TBD
- * @package RODSConn
- */
-
-
-require_once("autoload.inc.php");
-
-class RODSKeyValPair
-{
-    private $keys;
-    private $vals;
-
-    public function __construct(array $arr = array())
-    {
-        $this->keys = array_keys($arr);
-        $this->vals = array_values($arr);
-    }
-
-    public function addPair($key, $val)
-    {
-        $this->keys[] = $key;
-        $this->vals[] = $val;
-    }
-
-    /**
-     * Make a RP_KeyValPair
-     * @return RP_KeyValPair a RP_KeyValPair object
-     */
-    public function makePacket()
-    {
-        return new RP_KeyValPair(count($this->keys), $this->keys, $this->vals);
-    }
-
-    /**
-     * make a RODSKeyValPair from a RP_KeyValPair
-     */
-    public static function fromPacket(RP_KeyValPair $RP_KeyValPair)
-    {
-        $new_keyval = new RODSKeyValPair();
-        $new_keyval->keys = $RP_KeyValPair->keyWord;
-        $new_keyval->vals = $RP_KeyValPair->svalue;
-        return $new_keyval;
-    }
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php
deleted file mode 100644
index 243903a42d..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-require_once("autoload.inc.php");
-
-$GLOBALS['RODSMessage_types'] = array(
-    "RODS_CONNECT_T" => "RODS_CONNECT",
-    "RODS_VERSION_T" => "RODS_VERSION",
-    "RODS_API_REQ_T" => "RODS_API_REQ",
-    "RODS_DISCONNECT_T" => "RODS_DISCONNECT",
-    "RODS_REAUTH_T" => "RODS_REAUTH",
-    "RODS_API_REPLY_T" => "RODS_API_REPLY"
-);
-
-class RODSMessage
-{
-    private $type; // (String) message type, such as "RODS_CONNECT_T"
-    private $typestr; // (String) str representation of the type that RODS server understand
-    private $msg; // (RODSPacket) main message body
-    private $header; // (RODSPacket) a special packet, header for other packets
-    private $header_xml; // (string) packet header in XML
-    private $msg_xml; // (string) message in XML
-    private $binstr; // (string) binary string
-    private $errstr; // (string) error string
-    private $intinfo; // an additional integer info, for API, it is the
-    // apiReqNum
-    private $serialized;
-
-    public function __construct($type = NULL, $_msg = NULL, $intinfo = 0, $binstr = "", $errstr = "")
-    {
-        if (!isset($type)) {
-            return;
-        }
-
-        $this->type = $type;
-        $RODSMessage_types = $GLOBALS['RODSMessage_types'];
-        if (!isset($RODSMessage_types[$type])) {
-            throw new RODSException("RODSMessage::__construct failed.1! Unknown type '$type'",
-                "PERR_INTERNAL_ERR");
-        }
-        $this->typestr = $RODSMessage_types[$type];
-
-        if (isset($_msg)) {
-            if (!($_msg instanceof RODSPacket)) {
-                throw new RODSException("RODSMessage::__construct failed.2!",
-                    "PERR_INTERNAL_ERR");
-            }
-        }
-        $this->msg = $_msg;
-        $this->intinfo = $intinfo;
-        $this->binstr = $binstr;
-        $this->errstr = $errstr;
-    }
-
-    public function pack()
-    {
-        if (isset($this->msg))
-            $this->msg_xml = $this->msg->toXML();
-
-        $this->header = new RP_MsgHeader($this->typestr, strlen($this->msg_xml),
-            strlen($this->errstr), strlen($this->binstr), $this->intinfo);
-        $header_xml = $this->header->toXML();
-        $this->serialized = pack("N", strlen($header_xml)) . $header_xml .
-            $this->msg_xml;
-        return $this->serialized;
-    }
-
-
-    public function unpack($conn, &$bslen = NULL)
-    {
-        if (FALSE === ($chunk = stream_get_contents($conn, 4))) {
-            throw new RODSException("RODSMessage::unpack failed.0! ",
-                "SYS_PACK_INSTRUCT_FORMAT_ERR");
-        }
-
-
-        $arr = unpack("Nlen", $chunk);
-        $header_len = $arr['len'];
-        if ((!is_int($header_len)) || ($header_len < 1) || ($header_len > 8192 - 4)) {
-            throw new RODSException("RODSMessage::unpack failed.1! The header length is unexpected: '$header_len'",
-                "SYS_PACK_INSTRUCT_FORMAT_ERR");
-        }
-
-        $this->header_xml = stream_get_contents($conn, $header_len);
-        $this->parseHeaderXML($this->header_xml);
-        $intInfo = $this->header->intInfo;
-
-        // get main msg string
-        $msg_len = $this->header->msgLen;
-        $this->msg_xml = stream_get_contents($conn, $msg_len);
-        if ($msg_len != strlen($this->msg_xml)) {
-            throw new RODSException("RODSMessage::unpack failed.2! " .
-                    "The body length is unexpected: " . strlen($this->msg_xml) .
-                    " expecting: $msg_len",
-                "SYS_PACK_INSTRUCT_FORMAT_ERR");
-        }
-        if ($msg_len > 0) {
-            $this->parseBodyXML($this->msg_xml);
-        }
-
-        // get err string
-        $errlen = $this->header->errorLen;
-        $this->errstr = stream_get_contents($conn, $errlen);
-        if ($errlen != strlen($this->errstr)) {
-            throw new RODSException("RODSMessage::unpack failed.3! " .
-                    "The err length is unexpected: " . strlen($this->errstr) .
-                    " expecting: $errlen",
-                "SYS_PACK_INSTRUCT_FORMAT_ERR");
-        }
-
-        // get bin string
-        $bslen = $this->header->bsLen;
-        $this->binstr = stream_get_contents($conn, $bslen);
-        if ($bslen != strlen($this->binstr)) {
-            throw new RODSException("RODSMessage::unpack failed.4! " .
-                    "The bin str length is unexpected: " . strlen($this->binstr) .
-                    " expecting: $bslen",
-                "SYS_PACK_INSTRUCT_FORMAT_ERR");
-        }
-
-        return $this->header->intInfo;
-    }
-
-    private function parseHeaderXML($xmlstr)
-    {
-        $xml = new SimpleXMLElement($xmlstr);
-        $name = $xml->getName();
-        if ($name != "MsgHeader_PI") {
-            throw new RODSException("RODSMessage::parseHeaderXML failed! " .
-                    "The XML header name is unexpected:$name " .
-                    " expecting: MsgHeader_PI",
-                "SYS_PACK_INSTRUCT_FORMAT_ERR");
-        }
-        $this->header = new RP_MsgHeader();
-        $this->header->fromSXE($xml);
-    }
-
-    private function parseBodyXML($xmlstr)
-    {
-        //try {
-        $xml = new SimpleXMLElement($xmlstr);
-        $name = $xml->getName();
-        if (substr($name, -3, 3) != "_PI") {
-            throw new RODSException("RODSMessage::parseMainBodyXML failed! " .
-                    "The XML node's name is unexpected:$name " .
-                    " expecting some thing like xxx_PI",
-                "SYS_PACK_INSTRUCT_FORMAT_ERR");
-        }
-        $rp_classname = "RP_" . substr($name, 0, strlen($name) - 3);
-        $this->msg = new $rp_classname();
-        $this->msg->fromSXE($xml);
-
-        /*} catch (Exception $e) {
-          throw new RODSException("RODSMessage::parseMainBodyXML failed! ".
-              "Mal formated XML in RODS message :".
-              $xmlstr,
-              "SYS_PACK_INSTRUCT_FORMAT_ERR",$e);
-        }
-        */
-    }
-
-    public function getBody()
-    {
-        return $this->msg;
-    }
-
-    public function getBinstr()
-    {
-        return $this->binstr;
-    }
-
-    public function getXML()
-    {
-        return $this->header_xml . "\n" . $this->msg_xml;
-    }
-
-    public static function packConnectMsg($user, $zone, $relVersion = RODS_REL_VERSION,
-                                          $apiVersion = RODS_API_VERSION, $option = NULL)
-    {
-        $msgbody = new RP_StartupPack($user, $zone, $relVersion, $apiVersion . $option);
-        $rods_msg = new RODSMessage("RODS_CONNECT_T", $msgbody);
-        return $rods_msg->pack();
-    }
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSMeta.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSMeta.class.php
deleted file mode 100644
index 55d48af19d..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSMeta.class.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class RODSMeta
-{
-    public $name;
-    public $value;
-    public $units;
-    public $id;
-    public $op;
-
-    public function __construct($name, $value, $units = NULL, $id = NULL, $op = "=")
-    {
-        $this->name = $name;
-        $this->value = $value;
-        $this->units = $units;
-        $this->id = $id;
-        $this->op = $op;
-    }
-
-}  
-     
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php
deleted file mode 100644
index 1d367e900b..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-define ("DONE_OPR", 9999);
-define ("PUT_OPR", 1);
-define ("GET_OPR", 2);
-define ("SAME_HOST_COPY_OPR", 3);
-define ("COPY_TO_LOCAL_OPR", 4);
-define ("COPY_TO_REM_OPR", 5);
-define ("REPLICATE_OPR", 6);
-define ("REPLICATE_DEST", 7);
-define ("REPLICATE_SRC", 8);
-define ("COPY_DEST", 9);
-define ("COPY_SRC", 10);
-define ("RENAME_DATA_OBJ", 11);
-define ("RENAME_COLL", 12);
-define ("MOVE_OPR", 13);
-define ("RSYNC_OPR", 14);
-define ("PHYMV_OPR", 15);
-define ("PHYMV_SRC", 16);
-define ("PHYMV_DEST", 17);
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSQueryCondition.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSQueryCondition.class.php
deleted file mode 100644
index ecc0282065..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSQueryCondition.class.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-class RODSQueryCondition
-{
-    public $name;
-    public $value;
-    public $op;
-
-    public function __construct($name, $value, $op = "=")
-    {
-        $this->name = $name;
-        $this->value = $value;
-        $this->op = $op;
-    }
-
-    public function __toString()
-    {
-        return "$this->name $this->op '$this->value'";
-    }
-
-}  
-     
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php
deleted file mode 100644
index 258dfcab39..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-
-/* This file is generated by setRodsAPINum.php   Please modify that file if you wish to update the    API number.            */
-
-$GLOBALS['PRODS_API_NUMS'] = array(
-    'FILE_CREATE_AN' => '500',
-    'FILE_OPEN_AN' => '501',
-    'FILE_WRITE_AN' => '502',
-    'FILE_CLOSE_AN' => '503',
-    'FILE_LSEEK_AN' => '504',
-    'FILE_READ_AN' => '505',
-    'FILE_UNLINK_AN' => '506',
-    'FILE_MKDIR_AN' => '507',
-    'FILE_CHMOD_AN' => '508',
-    'FILE_RMDIR_AN' => '509',
-    'FILE_STAT_AN' => '510',
-    'FILE_FSTAT_AN' => '511',
-    'FILE_FSYNC_AN' => '512',
-    'FILE_STAGE_AN' => '513',
-    'FILE_GET_FS_FREE_SPACE_AN' => '514',
-    'FILE_OPENDIR_AN' => '515',
-    'FILE_CLOSEDIR_AN' => '516',
-    'FILE_READDIR_AN' => '517',
-    'FILE_PUT_AN' => '518',
-    'FILE_GET_AN' => '519',
-    'FILE_CHKSUM_AN' => '520',
-    'CHK_N_V_PATH_PERM_AN' => '521',
-    'FILE_RENAME_AN' => '522',
-    'FILE_TRUNCATE_AN' => '523',
-    'DATA_OBJ_CREATE_AN' => '601',
-    'DATA_OBJ_OPEN_AN' => '602',
-    'DATA_OBJ_READ_AN' => '603',
-    'DATA_OBJ_WRITE_AN' => '604',
-    'DATA_OBJ_CLOSE_AN' => '605',
-    'DATA_OBJ_PUT_AN' => '606',
-    'DATA_PUT_AN' => '607',
-    'DATA_OBJ_GET_AN' => '608',
-    'DATA_GET_AN' => '609',
-    'DATA_OBJ_REPL_AN' => '610',
-    'DATA_COPY_AN' => '611',
-    'DATA_OBJ_LSEEK_AN' => '612',
-    'DATA_OBJ_COPY_AN' => '613',
-    'SIMPLE_QUERY_AN' => '614',
-    'DATA_OBJ_UNLINK_AN' => '615',
-    'COLL_CREATE_AN' => '616',
-    'RM_COLL_OLD_AN' => '617',
-    'REG_COLL_AN' => '618',
-    'REG_DATA_OBJ_AN' => '619',
-    'UNREG_DATA_OBJ_AN' => '620',
-    'REG_REPLICA_AN' => '621',
-    'MOD_DATA_OBJ_META_AN' => '622',
-    'RULE_EXEC_SUBMIT_AN' => '623',
-    'RULE_EXEC_DEL_AN' => '624',
-    'EXEC_MY_RULE_AN' => '625',
-    'OPR_COMPLETE_AN' => '626',
-    'DATA_OBJ_RENAME_AN' => '627',
-    'DATA_OBJ_RSYNC_AN' => '628',
-    'DATA_OBJ_CHKSUM_AN' => '629',
-    'PHY_PATH_REG_AN' => '630',
-    'DATA_OBJ_PHYMV_AN' => '631',
-    'DATA_OBJ_TRIM_AN' => '632',
-    'OBJ_STAT_AN' => '633',
-    'EXEC_CMD_AN' => '634',
-    'SUB_STRUCT_FILE_CREATE_AN' => '635',
-    'SUB_STRUCT_FILE_OPEN_AN' => '636',
-    'SUB_STRUCT_FILE_READ_AN' => '637',
-    'SUB_STRUCT_FILE_WRITE_AN' => '638',
-    'SUB_STRUCT_FILE_CLOSE_AN' => '639',
-    'SUB_STRUCT_FILE_UNLINK_AN' => '640',
-    'SUB_STRUCT_FILE_STAT_AN' => '641',
-    'SUB_STRUCT_FILE_FSTAT_AN' => '642',
-    'SUB_STRUCT_FILE_LSEEK_AN' => '643',
-    'SUB_STRUCT_FILE_RENAME_AN' => '644',
-    'QUERY_SPEC_COLL_AN' => '645',
-    'MOD_COLL_AN' => '646',
-    'SUB_STRUCT_FILE_MKDIR_AN' => '647',
-    'SUB_STRUCT_FILE_RMDIR_AN' => '648',
-    'SUB_STRUCT_FILE_OPENDIR_AN' => '649',
-    'SUB_STRUCT_FILE_READDIR_AN' => '650',
-    'SUB_STRUCT_FILE_CLOSEDIR_AN' => '651',
-    'DATA_OBJ_TRUNCATE_AN' => '652',
-    'SUB_STRUCT_FILE_TRUNCATE_AN' => '653',
-    'GET_XMSG_TICKET_AN' => '654',
-    'SEND_XMSG_AN' => '655',
-    'RCV_XMSG_AN' => '656',
-    'SUB_STRUCT_FILE_GET_AN' => '657',
-    'SUB_STRUCT_FILE_PUT_AN' => '658',
-    'SYNC_MOUNTED_COLL_AN' => '659',
-    'STRUCT_FILE_SYNC_AN' => '660',
-    'CLOSE_COLLECTION_AN' => '661',
-    'COLL_REPL_AN' => '662',
-    'RM_COLL_AN' => '663',
-    'GET_MISC_SVR_INFO_AN' => '700',
-    'GENERAL_ADMIN_AN' => '701',
-    'GEN_QUERY_AN' => '702',
-    'AUTH_REQUEST_AN' => '703',
-    'AUTH_RESPONSE_AN' => '704',
-    'AUTH_CHECK_AN' => '705',
-    'MOD_AVU_METADATA_AN' => '706',
-    'MOD_ACCESS_CONTROL_AN' => '707',
-    'RULE_EXEC_MOD_AN' => '708',
-    'GET_TEMP_PASSWORD_AN' => '709',
-    'GENERAL_UPDATE_AN' => '710',
-    'GSI_AUTH_REQUEST_AN' => '711',
-    'OPEN_COLLECTION_AN' => '712',
-    'READ_COLLECTION_AN' => '713',
-    'PAM_AUTH_REQUEST_AN' => '725',
-    'SSL_START_AN' => '1100',
-    'SSL_END_AN' => '1101',
-);
-$GLOBALS['PRODS_API_NUMS_REV'] = array(
-    '500' => 'FILE_CREATE_AN',
-    '501' => 'FILE_OPEN_AN',
-    '502' => 'FILE_WRITE_AN',
-    '503' => 'FILE_CLOSE_AN',
-    '504' => 'FILE_LSEEK_AN',
-    '505' => 'FILE_READ_AN',
-    '506' => 'FILE_UNLINK_AN',
-    '507' => 'FILE_MKDIR_AN',
-    '508' => 'FILE_CHMOD_AN',
-    '509' => 'FILE_RMDIR_AN',
-    '510' => 'FILE_STAT_AN',
-    '511' => 'FILE_FSTAT_AN',
-    '512' => 'FILE_FSYNC_AN',
-    '513' => 'FILE_STAGE_AN',
-    '514' => 'FILE_GET_FS_FREE_SPACE_AN',
-    '515' => 'FILE_OPENDIR_AN',
-    '516' => 'FILE_CLOSEDIR_AN',
-    '517' => 'FILE_READDIR_AN',
-    '518' => 'FILE_PUT_AN',
-    '519' => 'FILE_GET_AN',
-    '520' => 'FILE_CHKSUM_AN',
-    '521' => 'CHK_N_V_PATH_PERM_AN',
-    '522' => 'FILE_RENAME_AN',
-    '523' => 'FILE_TRUNCATE_AN',
-    '601' => 'DATA_OBJ_CREATE_AN',
-    '602' => 'DATA_OBJ_OPEN_AN',
-    '603' => 'DATA_OBJ_READ_AN',
-    '604' => 'DATA_OBJ_WRITE_AN',
-    '605' => 'DATA_OBJ_CLOSE_AN',
-    '606' => 'DATA_OBJ_PUT_AN',
-    '607' => 'DATA_PUT_AN',
-    '608' => 'DATA_OBJ_GET_AN',
-    '609' => 'DATA_GET_AN',
-    '610' => 'DATA_OBJ_REPL_AN',
-    '611' => 'DATA_COPY_AN',
-    '612' => 'DATA_OBJ_LSEEK_AN',
-    '613' => 'DATA_OBJ_COPY_AN',
-    '614' => 'SIMPLE_QUERY_AN',
-    '615' => 'DATA_OBJ_UNLINK_AN',
-    '616' => 'COLL_CREATE_AN',
-    '617' => 'RM_COLL_OLD_AN',
-    '618' => 'REG_COLL_AN',
-    '619' => 'REG_DATA_OBJ_AN',
-    '620' => 'UNREG_DATA_OBJ_AN',
-    '621' => 'REG_REPLICA_AN',
-    '622' => 'MOD_DATA_OBJ_META_AN',
-    '623' => 'RULE_EXEC_SUBMIT_AN',
-    '624' => 'RULE_EXEC_DEL_AN',
-    '625' => 'EXEC_MY_RULE_AN',
-    '626' => 'OPR_COMPLETE_AN',
-    '627' => 'DATA_OBJ_RENAME_AN',
-    '628' => 'DATA_OBJ_RSYNC_AN',
-    '629' => 'DATA_OBJ_CHKSUM_AN',
-    '630' => 'PHY_PATH_REG_AN',
-    '631' => 'DATA_OBJ_PHYMV_AN',
-    '632' => 'DATA_OBJ_TRIM_AN',
-    '633' => 'OBJ_STAT_AN',
-    '634' => 'EXEC_CMD_AN',
-    '635' => 'SUB_STRUCT_FILE_CREATE_AN',
-    '636' => 'SUB_STRUCT_FILE_OPEN_AN',
-    '637' => 'SUB_STRUCT_FILE_READ_AN',
-    '638' => 'SUB_STRUCT_FILE_WRITE_AN',
-    '639' => 'SUB_STRUCT_FILE_CLOSE_AN',
-    '640' => 'SUB_STRUCT_FILE_UNLINK_AN',
-    '641' => 'SUB_STRUCT_FILE_STAT_AN',
-    '642' => 'SUB_STRUCT_FILE_FSTAT_AN',
-    '643' => 'SUB_STRUCT_FILE_LSEEK_AN',
-    '644' => 'SUB_STRUCT_FILE_RENAME_AN',
-    '645' => 'QUERY_SPEC_COLL_AN',
-    '646' => 'MOD_COLL_AN',
-    '647' => 'SUB_STRUCT_FILE_MKDIR_AN',
-    '648' => 'SUB_STRUCT_FILE_RMDIR_AN',
-    '649' => 'SUB_STRUCT_FILE_OPENDIR_AN',
-    '650' => 'SUB_STRUCT_FILE_READDIR_AN',
-    '651' => 'SUB_STRUCT_FILE_CLOSEDIR_AN',
-    '652' => 'DATA_OBJ_TRUNCATE_AN',
-    '653' => 'SUB_STRUCT_FILE_TRUNCATE_AN',
-    '654' => 'GET_XMSG_TICKET_AN',
-    '655' => 'SEND_XMSG_AN',
-    '656' => 'RCV_XMSG_AN',
-    '657' => 'SUB_STRUCT_FILE_GET_AN',
-    '658' => 'SUB_STRUCT_FILE_PUT_AN',
-    '659' => 'SYNC_MOUNTED_COLL_AN',
-    '660' => 'STRUCT_FILE_SYNC_AN',
-    '661' => 'CLOSE_COLLECTION_AN',
-    '662' => 'COLL_REPL_AN',
-    '663' => 'RM_COLL_AN',
-    '700' => 'GET_MISC_SVR_INFO_AN',
-    '701' => 'GENERAL_ADMIN_AN',
-    '702' => 'GEN_QUERY_AN',
-    '703' => 'AUTH_REQUEST_AN',
-    '704' => 'AUTH_RESPONSE_AN',
-    '705' => 'AUTH_CHECK_AN',
-    '706' => 'MOD_AVU_METADATA_AN',
-    '707' => 'MOD_ACCESS_CONTROL_AN',
-    '708' => 'RULE_EXEC_MOD_AN',
-    '709' => 'GET_TEMP_PASSWORD_AN',
-    '710' => 'GENERAL_UPDATE_AN',
-    '711' => 'GSI_AUTH_REQUEST_AN',
-    '712' => 'OPEN_COLLECTION_AN',
-    '713' => 'READ_COLLECTION_AN',
-    '725' => 'PAM_AUTH_REQUEST_AN',
-    '1100' => 'SSL_START_AN',
-    '1101' => 'SSL_END_AN',
-);
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php
deleted file mode 100644
index ecc2f5c259..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-// following is general defines. Do not motify unless you know what you
-// are doing!
-define ("ORDER_BY", 0x400);
-define ("ORDER_BY_DESC", 0x800);
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php
deleted file mode 100644
index 177ca5b126..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php
+++ /dev/null
@@ -1,586 +0,0 @@
-<?php
-
-/* This file is generated by setRodsErrorCodes.php.    Please modify that file if you wish to update the    error codes.            */
-
-$GLOBALS['PRODS_ERR_CODES'] = array(
-    'SYS_SOCK_OPEN_ERR' => '-1000',
-    'SYS_SOCK_BIND_ERR' => '-2000',
-    'SYS_SOCK_ACCEPT_ERR' => '-3000',
-    'SYS_HEADER_READ_LEN_ERR' => '-4000',
-    'SYS_HEADER_WRITE_LEN_ERR' => '-5000',
-    'SYS_HEADER_TPYE_LEN_ERR' => '-6000',
-    'SYS_CAUGHT_SIGNAL' => '-7000',
-    'SYS_GETSTARTUP_PACK_ERR' => '-8000',
-    'SYS_EXCEED_CONNECT_CNT' => '-9000',
-    'SYS_USER_NOT_ALLOWED_TO_CONN' => '-10000',
-    'SYS_READ_MSG_BODY_INPUT_ERR' => '-11000',
-    'SYS_UNMATCHED_API_NUM' => '-12000',
-    'SYS_NO_API_PRIV' => '-13000',
-    'SYS_API_INPUT_ERR' => '-14000',
-    'SYS_PACK_INSTRUCT_FORMAT_ERR' => '-15000',
-    'SYS_MALLOC_ERR' => '-16000',
-    'SYS_GET_HOSTNAME_ERR' => '-17000',
-    'SYS_OUT_OF_FILE_DESC' => '-18000',
-    'SYS_FILE_DESC_OUT_OF_RANGE' => '-19000',
-    'SYS_UNRECOGNIZED_REMOTE_FLAG' => '-20000',
-    'SYS_INVALID_SERVER_HOST' => '-21000',
-    'SYS_SVR_TO_SVR_CONNECT_FAILED' => '-22000',
-    'SYS_BAD_FILE_DESCRIPTOR' => '-23000',
-    'SYS_INTERNAL_NULL_INPUT_ERR' => '-24000',
-    'SYS_CONFIG_FILE_ERR' => '-25000',
-    'SYS_INVALID_ZONE_NAME' => '-26000',
-    'SYS_COPY_LEN_ERR' => '-27000',
-    'SYS_PORT_COOKIE_ERR' => '-28000',
-    'SYS_KEY_VAL_TABLE_ERR' => '-29000',
-    'SYS_INVALID_RESC_TYPE' => '-30000',
-    'SYS_INVALID_FILE_PATH' => '-31000',
-    'SYS_INVALID_RESC_INPUT' => '-32000',
-    'SYS_INVALID_PORTAL_OPR' => '-33000',
-    'SYS_PARA_OPR_NO_SUPPORT' => '-34000',
-    'SYS_INVALID_OPR_TYPE' => '-35000',
-    'SYS_NO_PATH_PERMISSION' => '-36000',
-    'SYS_NO_ICAT_SERVER_ERR' => '-37000',
-    'SYS_AGENT_INIT_ERR' => '-38000',
-    'SYS_PROXYUSER_NO_PRIV' => '-39000',
-    'SYS_NO_DATA_OBJ_PERMISSION' => '-40000',
-    'SYS_DELETE_DISALLOWED' => '-41000',
-    'SYS_OPEN_REI_FILE_ERR' => '-42000',
-    'SYS_NO_RCAT_SERVER_ERR' => '-43000',
-    'SYS_UNMATCH_PACK_INSTRUCTI_NAME' => '-44000',
-    'SYS_SVR_TO_CLI_MSI_NO_EXIST' => '-45000',
-    'SYS_COPY_ALREADY_IN_RESC' => '-46000',
-    'SYS_RECONN_OPR_MISMATCH' => '-47000',
-    'SYS_INPUT_PERM_OUT_OF_RANGE' => '-48000',
-    'SYS_FORK_ERROR' => '-49000',
-    'SYS_PIPE_ERROR' => '-50000',
-    'SYS_EXEC_CMD_STATUS_SZ_ERROR' => '-51000',
-    'SYS_PATH_IS_NOT_A_FILE' => '-52000',
-    'SYS_UNMATCHED_SPEC_COLL_TYPE' => '-53000',
-    'SYS_TOO_MANY_QUERY_RESULT' => '-54000',
-    'USER_AUTH_SCHEME_ERR' => '-300000',
-    'USER_AUTH_STRING_EMPTY' => '-301000',
-    'USER_RODS_HOST_EMPTY' => '-302000',
-    'USER_RODS_HOSTNAME_ERR' => '-303000',
-    'USER_SOCK_OPEN_ERR' => '-304000',
-    'USER_SOCK_CONNECT_ERR' => '-305000',
-    'USER_STRLEN_TOOLONG' => '-306000',
-    'USER_API_INPUT_ERR' => '-307000',
-    'USER_PACKSTRUCT_INPUT_ERR' => '-308000',
-    'USER_NO_SUPPORT_ERR' => '-309000',
-    'USER_FILE_DOES_NOT_EXIST' => '-310000',
-    'USER_FILE_TOO_LARGE' => '-311000',
-    'OVERWITE_WITHOUT_FORCE_FLAG' => '-312000',
-    'UNMATCHED_KEY_OR_INDEX' => '-313000',
-    'USER_CHKSUM_MISMATCH' => '-314000',
-    'USER_BAD_KEYWORD_ERR' => '-315000',
-    'USER__NULL_INPUT_ERR' => '-316000',
-    'USER_INPUT_PATH_ERR' => '-317000',
-    'USER_INPUT_OPTION_ERR' => '-318000',
-    'USER_INVALID_USERNAME_FORMAT' => '-319000',
-    'USER_DIRECT_RESC_INPUT_ERR' => '-320000',
-    'USER_NO_RESC_INPUT_ERR' => '-321000',
-    'USER_PARAM_LABEL_ERR' => '-322000',
-    'USER_PARAM_TYPE_ERR' => '-323000',
-    'BASE64_BUFFER_OVERFLOW' => '-324000',
-    'BASE64_INVALID_PACKET' => '-325000',
-    'USER_MSG_TYPE_NO_SUPPORT' => '-326000',
-    'USER_RSYNC_NO_MODE_INPUT_ERR' => '-337000',
-    'USER_OPTION_INPUT_ERR' => '-338000',
-    'SAME_SRC_DEST_PATHS_ERR' => '-339000',
-    'USER_RESTART_FILE_INPUT_ERR' => '-340000',
-    'RESTART_OPR_FAILED' => '-341000',
-    'BAD_EXEC_CMD_PATH' => '-342000',
-    'EXEC_CMD_OUTPUT_TOO_LARGE' => '-343000',
-    'EXEC_CMD_ERROR' => '-344000',
-    'FILE_INDEX_LOOKUP_ERR' => '-500000',
-    'UNIX_FILE_OPEN_ERR' => '-510000',
-    'UNIX_FILE_OPEN_ERR_1' => '-510001',
-    'UNIX_FILE_OPEN_ERR_2' => '-510002',
-    'UNIX_FILE_CREATE_ERR' => '-511000',
-    'UNIX_FILE_READ_ERR' => '-512000',
-    'UNIX_FILE_WRITE_ERR' => '-513000',
-    'UNIX_FILE_CLOSE_ERR' => '-514000',
-    'UNIX_FILE_UNLINK_ERR' => '-515000',
-    'UNIX_FILE_STAT_ERR' => '-516000',
-    'UNIX_FILE_FSTAT_ERR' => '-517000',
-    'UNIX_FILE_LSEEK_ERR' => '-518000',
-    'UNIX_FILE_FSYNC_ERR' => '-519000',
-    'UNIX_FILE_MKDIR_ERR' => '-520000',
-    'UNIX_FILE_RMDIR_ERR' => '-521000',
-    'UNIX_FILE_OPENDIR_ERR' => '-522000',
-    'UNIX_FILE_CLOSEDIR_ERR' => '-523000',
-    'UNIX_FILE_READDIR_ERR' => '-524000',
-    'UNIX_FILE_STAGE_ERR' => '-525000',
-    'UNIX_FILE_GET_FS_FREESPACE_ERR' => '-526000',
-    'UNIX_FILE_CHMOD_ERR' => '-527000',
-    'UNIX_FILE_RENAME_ERR' => '-528000',
-    'CATALOG_NOT_CONNECTED' => '-801000',
-    'CAT_ENV_ERR' => '-802000',
-    'CAT_CONNECT_ERR' => '-803000',
-    'CAT_DISCONNECT_ERR' => '-804000',
-    'CAT_CLOSE_ENV_ERR' => '-805000',
-    'CAT_SQL_ERR' => '-806000',
-    'CAT_GET_ROW_ERR' => '-807000',
-    'CAT_NO_ROWS_FOUND' => '-808000',
-    'CATALOG_ALREADY_HAS_ITEM_BY_THAT_NAME' => '-809000',
-    'CAT_INVALID_RESOURCE_TYPE' => '-810000',
-    'CAT_INVALID_RESOURCE_CLASS' => '-811000',
-    'CAT_INVALID_RESOURCE_NET_ADDR' => '-812000',
-    'CAT_INVALID_RESOURCE_VAULT_PATH' => '-813000',
-    'CAT_UNKNOWN_COLLECTION' => '-814000',
-    'CAT_INVALID_DATA_TYPE' => '-815000',
-    'CAT_INVALID_ARGUMENT' => '-816000',
-    'CAT_UNKNOWN_FILE' => '-817000',
-    'CAT_NO_ACCESS_PERMISSION' => '-818000',
-    'CAT_SUCCESS_BUT_WITH_NO_INFO' => '-819000',
-    'CAT_INVALID_USER_TYPE' => '-820000',
-    'CAT_COLLECTION_NOT_EMPTY' => '-821000',
-    'CAT_TOO_MANY_TABLES' => '-822000',
-    'CAT_UNKNOWN_TABLE' => '-823000',
-    'CAT_NOT_OPEN' => '-824000',
-    'CAT_FAILED_TO_LINK_TABLES' => '-825000',
-    'CAT_INVALID_AUTHENTICATION' => '-826000',
-    'CAT_INVALID_USER' => '-827000',
-    'CAT_INVALID_ZONE' => '-828000',
-    'CAT_INVALID_GROUP' => '-829000',
-    'CAT_INSUFFICIENT_PRIVILEGE_LEVEL' => '-830000',
-    'CAT_INVALID_RESOURCE' => '-831000',
-    'CAT_INVALID_CLIENT_USER' => '-832000',
-    'CAT_NAME_EXISTS_AS_COLLECTION' => '-833000',
-    'CAT_NAME_EXISTS_AS_DATAOBJ' => '-834000',
-    'CAT_RESOURCE_NOT_EMPTY' => '-835000',
-    'CAT_NOT_A_DATAOBJ_AND_NOT_A_COLLECTION' => '-836000',
-    'CAT_RECURSIVE_MOVE' => '-837000',
-    'CAT_LAST_REPLICA' => '-838000',
-    'CAT_OCI_ERROR' => '-839000',
-    'CAT_PASSWORD_EXPIRED' => '-840000',
-    'FILE_OPEN_ERR' => '-900000',
-    'FILE_READ_ERR' => '-901000',
-    'FILE_WRITE_ERR' => '-902000',
-    'PASSWORD_EXCEEDS_MAX_SIZE' => '-903000',
-    'ENVIRONMENT_VAR_HOME_NOT_DEFINED' => '-904000',
-    'UNABLE_TO_STAT_FILE' => '-905000',
-    'AUTH_FILE_NOT_ENCRYPTED' => '-906000',
-    'AUTH_FILE_DOES_NOT_EXIST' => '-907000',
-    'UNLINK_FAILED' => '-908000',
-    'NO_PASSWORD_ENTERED' => '-909000',
-    'OBJPATH_EMPTY_IN_STRUCT_ERR' => '-1000000',
-    'RESCNAME_EMPTY_IN_STRUCT_ERR' => '-1001000',
-    'DATATYPE_EMPTY_IN_STRUCT_ERR' => '-1002000',
-    'DATASIZE_EMPTY_IN_STRUCT_ERR' => '-1003000',
-    'CHKSUM_EMPTY_IN_STRUCT_ERR' => '-1004000',
-    'VERSION_EMPTY_IN_STRUCT_ERR' => '-1005000',
-    'FILEPATH_EMPTY_IN_STRUCT_ERR' => '-1006000',
-    'REPLNUM_EMPTY_IN_STRUCT_ERR' => '-1007000',
-    'REPLSTATUS_EMPTY_IN_STRUCT_ERR' => '-1008000',
-    'DATAOWNER_EMPTY_IN_STRUCT_ERR' => '-1009000',
-    'DATAOWNERZONE_EMPTY_IN_STRUCT_ERR' => '-1010000',
-    'DATAEXPIRY_EMPTY_IN_STRUCT_ERR' => '-1011000',
-    'DATACOMMENTS_EMPTY_IN_STRUCT_ERR' => '-1012000',
-    'DATACREATE_EMPTY_IN_STRUCT_ERR' => '-1013000',
-    'DATAMODIFY_EMPTY_IN_STRUCT_ERR' => '-1014000',
-    'DATAACCESS_EMPTY_IN_STRUCT_ERR' => '-1015000',
-    'DATAACCESSINX_EMPTY_IN_STRUCT_ERR' => '-1016000',
-    'NO_RULE_FOUND_ERR' => '-1017000',
-    'NO_MORE_RULES_ERR' => '-1018000',
-    'UNMATCHED_ACTION_ERR' => '-1019000',
-    'RULES_FILE_READ_ERROR' => '-1020000',
-    'ACTION_ARG_COUNT_MISMATCH' => '-1021000',
-    'MAX_NUM_OF_ARGS_IN_ACTION_EXCEEDED' => '-1022000',
-    'UNKNOWN_PARAM_IN_RULE_ERR' => '-1023000',
-    'DESTRESCNAME_EMPTY_IN_STRUCT_ERR' => '-1024000',
-    'BACKUPRESCNAME_EMPTY_IN_STRUCT_ERR' => '-1025000',
-    'DATAID_EMPTY_IN_STRUCT_ERR' => '-1026000',
-    'COLLID_EMPTY_IN_STRUCT_ERR' => '-1027000',
-    'RESCGROUPNAME_EMPTY_IN_STRUCT_ERR' => '-1028000',
-    'STATUSSTRING_EMPTY_IN_STRUCT_ERR' => '-1029000',
-    'DATAMAPID_EMPTY_IN_STRUCT_ERR' => '-1030000',
-    'USERNAMECLIENT_EMPTY_IN_STRUCT_ERR' => '-1031000',
-    'RODSZONECLIENT_EMPTY_IN_STRUCT_ERR' => '-1032000',
-    'USERTYPECLIENT_EMPTY_IN_STRUCT_ERR' => '-1033000',
-    'HOSTCLIENT_EMPTY_IN_STRUCT_ERR' => '-1034000',
-    'AUTHSTRCLIENT_EMPTY_IN_STRUCT_ERR' => '-1035000',
-    'USERAUTHSCHEMECLIENT_EMPTY_IN_STRUCT_ERR' => '-1036000',
-    'USERINFOCLIENT_EMPTY_IN_STRUCT_ERR' => '-1037000',
-    'USERCOMMENTCLIENT_EMPTY_IN_STRUCT_ERR' => '-1038000',
-    'USERCREATECLIENT_EMPTY_IN_STRUCT_ERR' => '-1039000',
-    'USERMODIFYCLIENT_EMPTY_IN_STRUCT_ERR' => '-1040000',
-    'USERNAMEPROXY_EMPTY_IN_STRUCT_ERR' => '-1041000',
-    'RODSZONEPROXY_EMPTY_IN_STRUCT_ERR' => '-1042000',
-    'USERTYPEPROXY_EMPTY_IN_STRUCT_ERR' => '-1043000',
-    'HOSTPROXY_EMPTY_IN_STRUCT_ERR' => '-1044000',
-    'AUTHSTRPROXY_EMPTY_IN_STRUCT_ERR' => '-1045000',
-    'USERAUTHSCHEMEPROXY_EMPTY_IN_STRUCT_ERR' => '-1046000',
-    'USERINFOPROXY_EMPTY_IN_STRUCT_ERR' => '-1047000',
-    'USERCOMMENTPROXY_EMPTY_IN_STRUCT_ERR' => '-1048000',
-    'USERCREATEPROXY_EMPTY_IN_STRUCT_ERR' => '-1049000',
-    'USERMODIFYPROXY_EMPTY_IN_STRUCT_ERR' => '-1050000',
-    'COLLNAME_EMPTY_IN_STRUCT_ERR' => '-1051000',
-    'COLLPARENTNAME_EMPTY_IN_STRUCT_ERR' => '-1052000',
-    'COLLOWNERNAME_EMPTY_IN_STRUCT_ERR' => '-1053000',
-    'COLLOWNERZONE_EMPTY_IN_STRUCT_ERR' => '-1054000',
-    'COLLEXPIRY_EMPTY_IN_STRUCT_ERR' => '-1055000',
-    'COLLCOMMENTS_EMPTY_IN_STRUCT_ERR' => '-1056000',
-    'COLLCREATE_EMPTY_IN_STRUCT_ERR' => '-1057000',
-    'COLLMODIFY_EMPTY_IN_STRUCT_ERR' => '-1058000',
-    'COLLACCESS_EMPTY_IN_STRUCT_ERR' => '-1059000',
-    'COLLACCESSINX_EMPTY_IN_STRUCT_ERR' => '-1060000',
-    'COLLMAPID_EMPTY_IN_STRUCT_ERR' => '-1062000',
-    'COLLINHERITANCE_EMPTY_IN_STRUCT_ERR' => '-1063000',
-    'RESCZONE_EMPTY_IN_STRUCT_ERR' => '-1065000',
-    'RESCLOC_EMPTY_IN_STRUCT_ERR' => '-1066000',
-    'RESCTYPE_EMPTY_IN_STRUCT_ERR' => '-1067000',
-    'RESCTYPEINX_EMPTY_IN_STRUCT_ERR' => '-1068000',
-    'RESCCLASS_EMPTY_IN_STRUCT_ERR' => '-1069000',
-    'RESCCLASSINX_EMPTY_IN_STRUCT_ERR' => '-1070000',
-    'RESCVAULTPATH_EMPTY_IN_STRUCT_ERR' => '-1071000',
-    'NUMOPEN_ORTS_EMPTY_IN_STRUCT_ERR' => '-1072000',
-    'PARAOPR_EMPTY_IN_STRUCT_ERR' => '-1073000',
-    'RESCID_EMPTY_IN_STRUCT_ERR' => '-1074000',
-    'GATEWAYADDR_EMPTY_IN_STRUCT_ERR' => '-1075000',
-    'RESCMAX_BJSIZE_EMPTY_IN_STRUCT_ERR' => '-1076000',
-    'FREESPACE_EMPTY_IN_STRUCT_ERR' => '-1077000',
-    'FREESPACETIME_EMPTY_IN_STRUCT_ERR' => '-1078000',
-    'FREESPACETIMESTAMP_EMPTY_IN_STRUCT_ERR' => '-1079000',
-    'RESCINFO_EMPTY_IN_STRUCT_ERR' => '-1080000',
-    'RESCCOMMENTS_EMPTY_IN_STRUCT_ERR' => '-1081000',
-    'RESCCREATE_EMPTY_IN_STRUCT_ERR' => '-1082000',
-    'RESCMODIFY_EMPTY_IN_STRUCT_ERR' => '-1083000',
-    'INPUT_ARG_NOT_WELL_FORMED_ERR' => '-1084000',
-    'INPUT_ARG_OUT_OF_ARGC_RANGE_ERR' => '-1085000',
-    'INSUFFICIENT_INPUT_ARG_ERR' => '-1086000',
-    'INPUT_ARG_DOES_NOT_MATCH_ERR' => '-1087000',
-    'RETRY_WITHOUT_RECOVERY_ERR' => '-1088000',
-    'CUT_ACTION_PROCESSED_ERR' => '-1089000',
-    'ACTION_FAILED_ERR' => '-1090000',
-    'FAIL_ACTION_ENCOUNTERED_ERR' => '-1091000',
-    'VARIABLE_NAME_TOO_LONG_ERR' => '-1092000',
-    'UNKNOWN_VARIABLE_MAP_ERR' => '-1093000',
-    'UNDEFINED_VARIABLE_MAP_ERR' => '-1094000',
-    'NULL_VALUE_ERR' => '-1095000',
-    'DVARMAP_FILE_READ_ERROR' => '-1096000',
-    'NO_RULE_OR_MSI_FUNCTION_FOUND_ERR' => '-1097000',
-    'FILE_CREATE_ERROR' => '-1098000',
-    'FMAP_FILE_READ_ERROR' => '-1099000',
-    'DATE_FORMAT_ERR' => '-1100000',
-    'RULE_FAILED_ERR' => '-1101000',
-    'NO_MICROSERVICE_FOUND_ERR' => '-1102000',
-    'INVALID_REGEXP' => '-1103000',
-    'INVALID_OBJECT_NAME' => '-1104000',
-    'INVALID_OBJECT_TYPE' => '-1105000',
-    'NO_VALUES_FOUND' => '-1106000',
-    'NO_COLUMN_NAME_FOUND' => '-1107000',
-    'SYS_NULL_INPUT' => '-99999996',
-    'SYS_HANDLER_DONE_WITH_ERROR' => '-99999997',
-    'SYS_HANDLER_DONE_NO_ERROR' => '-99999998',
-    'SYS_NO_HANDLER_REPLY_MSG' => '-99999999',
-    'GENERAL_PRODS_ERR' => '-3000000',
-    'PERR_INTERNAL_ERR' => '-3100000',
-    'PERR_UNEXPECTED_PACKET_FORMAT' => '-3101000',
-    'PERR_PATH_DOES_NOT_EXISTS' => '-3102000',
-    'PERR_UNSUPPORTED_PROTOCOL_SCHEME' => '-3103000',
-    'PERR_USER_INPUT_ERROR' => '-3104000',
-    'PERR_USER_INPUT_PATH_ERROR' => '-3105000',
-    'PERR_CONN_NOT_ACTIVE' => '-3106000',
-    'SSL_NOT_BUILT_INTO_CLIENT' => '-2100000',
-    'SSL_NOT_BUILT_INTO_SERVER' => '-2101000',
-    'SSL_INIT_ERROR' => '-2102000',
-    'SSL_HANDSHAKE_ERROR' => '-2103000',
-    'SSL_SHUTDOWN_ERROR' => '-2104000',
-    'SSL_CERT_ERROR' => '-2105000',
-    'PAM_AUTH_NOT_BUILT_INTO_CLIENT' => '-991000',
-    'PAM_AUTH_NOT_BUILT_INTO_SERVER' => '-992000',
-    'PAM_AUTH_PASSWORD_FAILED' => '-993000',
-    'PAM_AUTH_PASSWORD_INVALID_TTL' => '-994000',
-);
-$GLOBALS['PRODS_ERR_CODES_REV'] = array(
-    '-1000' => 'SYS_SOCK_OPEN_ERR',
-    '-2000' => 'SYS_SOCK_BIND_ERR',
-    '-3000' => 'SYS_SOCK_ACCEPT_ERR',
-    '-4000' => 'SYS_HEADER_READ_LEN_ERR',
-    '-5000' => 'SYS_HEADER_WRITE_LEN_ERR',
-    '-6000' => 'SYS_HEADER_TPYE_LEN_ERR',
-    '-7000' => 'SYS_CAUGHT_SIGNAL',
-    '-8000' => 'SYS_GETSTARTUP_PACK_ERR',
-    '-9000' => 'SYS_EXCEED_CONNECT_CNT',
-    '-10000' => 'SYS_USER_NOT_ALLOWED_TO_CONN',
-    '-11000' => 'SYS_READ_MSG_BODY_INPUT_ERR',
-    '-12000' => 'SYS_UNMATCHED_API_NUM',
-    '-13000' => 'SYS_NO_API_PRIV',
-    '-14000' => 'SYS_API_INPUT_ERR',
-    '-15000' => 'SYS_PACK_INSTRUCT_FORMAT_ERR',
-    '-16000' => 'SYS_MALLOC_ERR',
-    '-17000' => 'SYS_GET_HOSTNAME_ERR',
-    '-18000' => 'SYS_OUT_OF_FILE_DESC',
-    '-19000' => 'SYS_FILE_DESC_OUT_OF_RANGE',
-    '-20000' => 'SYS_UNRECOGNIZED_REMOTE_FLAG',
-    '-21000' => 'SYS_INVALID_SERVER_HOST',
-    '-22000' => 'SYS_SVR_TO_SVR_CONNECT_FAILED',
-    '-23000' => 'SYS_BAD_FILE_DESCRIPTOR',
-    '-24000' => 'SYS_INTERNAL_NULL_INPUT_ERR',
-    '-25000' => 'SYS_CONFIG_FILE_ERR',
-    '-26000' => 'SYS_INVALID_ZONE_NAME',
-    '-27000' => 'SYS_COPY_LEN_ERR',
-    '-28000' => 'SYS_PORT_COOKIE_ERR',
-    '-29000' => 'SYS_KEY_VAL_TABLE_ERR',
-    '-30000' => 'SYS_INVALID_RESC_TYPE',
-    '-31000' => 'SYS_INVALID_FILE_PATH',
-    '-32000' => 'SYS_INVALID_RESC_INPUT',
-    '-33000' => 'SYS_INVALID_PORTAL_OPR',
-    '-34000' => 'SYS_PARA_OPR_NO_SUPPORT',
-    '-35000' => 'SYS_INVALID_OPR_TYPE',
-    '-36000' => 'SYS_NO_PATH_PERMISSION',
-    '-37000' => 'SYS_NO_ICAT_SERVER_ERR',
-    '-38000' => 'SYS_AGENT_INIT_ERR',
-    '-39000' => 'SYS_PROXYUSER_NO_PRIV',
-    '-40000' => 'SYS_NO_DATA_OBJ_PERMISSION',
-    '-41000' => 'SYS_DELETE_DISALLOWED',
-    '-42000' => 'SYS_OPEN_REI_FILE_ERR',
-    '-43000' => 'SYS_NO_RCAT_SERVER_ERR',
-    '-44000' => 'SYS_UNMATCH_PACK_INSTRUCTI_NAME',
-    '-45000' => 'SYS_SVR_TO_CLI_MSI_NO_EXIST',
-    '-46000' => 'SYS_COPY_ALREADY_IN_RESC',
-    '-47000' => 'SYS_RECONN_OPR_MISMATCH',
-    '-48000' => 'SYS_INPUT_PERM_OUT_OF_RANGE',
-    '-49000' => 'SYS_FORK_ERROR',
-    '-50000' => 'SYS_PIPE_ERROR',
-    '-51000' => 'SYS_EXEC_CMD_STATUS_SZ_ERROR',
-    '-52000' => 'SYS_PATH_IS_NOT_A_FILE',
-    '-53000' => 'SYS_UNMATCHED_SPEC_COLL_TYPE',
-    '-54000' => 'SYS_TOO_MANY_QUERY_RESULT',
-    '-300000' => 'USER_AUTH_SCHEME_ERR',
-    '-301000' => 'USER_AUTH_STRING_EMPTY',
-    '-302000' => 'USER_RODS_HOST_EMPTY',
-    '-303000' => 'USER_RODS_HOSTNAME_ERR',
-    '-304000' => 'USER_SOCK_OPEN_ERR',
-    '-305000' => 'USER_SOCK_CONNECT_ERR',
-    '-306000' => 'USER_STRLEN_TOOLONG',
-    '-307000' => 'USER_API_INPUT_ERR',
-    '-308000' => 'USER_PACKSTRUCT_INPUT_ERR',
-    '-309000' => 'USER_NO_SUPPORT_ERR',
-    '-310000' => 'USER_FILE_DOES_NOT_EXIST',
-    '-311000' => 'USER_FILE_TOO_LARGE',
-    '-312000' => 'OVERWITE_WITHOUT_FORCE_FLAG',
-    '-313000' => 'UNMATCHED_KEY_OR_INDEX',
-    '-314000' => 'USER_CHKSUM_MISMATCH',
-    '-315000' => 'USER_BAD_KEYWORD_ERR',
-    '-316000' => 'USER__NULL_INPUT_ERR',
-    '-317000' => 'USER_INPUT_PATH_ERR',
-    '-318000' => 'USER_INPUT_OPTION_ERR',
-    '-319000' => 'USER_INVALID_USERNAME_FORMAT',
-    '-320000' => 'USER_DIRECT_RESC_INPUT_ERR',
-    '-321000' => 'USER_NO_RESC_INPUT_ERR',
-    '-322000' => 'USER_PARAM_LABEL_ERR',
-    '-323000' => 'USER_PARAM_TYPE_ERR',
-    '-324000' => 'BASE64_BUFFER_OVERFLOW',
-    '-325000' => 'BASE64_INVALID_PACKET',
-    '-326000' => 'USER_MSG_TYPE_NO_SUPPORT',
-    '-337000' => 'USER_RSYNC_NO_MODE_INPUT_ERR',
-    '-338000' => 'USER_OPTION_INPUT_ERR',
-    '-339000' => 'SAME_SRC_DEST_PATHS_ERR',
-    '-340000' => 'USER_RESTART_FILE_INPUT_ERR',
-    '-341000' => 'RESTART_OPR_FAILED',
-    '-342000' => 'BAD_EXEC_CMD_PATH',
-    '-343000' => 'EXEC_CMD_OUTPUT_TOO_LARGE',
-    '-344000' => 'EXEC_CMD_ERROR',
-    '-500000' => 'FILE_INDEX_LOOKUP_ERR',
-    '-510000' => 'UNIX_FILE_OPEN_ERR',
-    '-510001' => 'UNIX_FILE_OPEN_ERR_1',
-    '-510002' => 'UNIX_FILE_OPEN_ERR_2',
-    '-511000' => 'UNIX_FILE_CREATE_ERR',
-    '-512000' => 'UNIX_FILE_READ_ERR',
-    '-513000' => 'UNIX_FILE_WRITE_ERR',
-    '-514000' => 'UNIX_FILE_CLOSE_ERR',
-    '-515000' => 'UNIX_FILE_UNLINK_ERR',
-    '-516000' => 'UNIX_FILE_STAT_ERR',
-    '-517000' => 'UNIX_FILE_FSTAT_ERR',
-    '-518000' => 'UNIX_FILE_LSEEK_ERR',
-    '-519000' => 'UNIX_FILE_FSYNC_ERR',
-    '-520000' => 'UNIX_FILE_MKDIR_ERR',
-    '-521000' => 'UNIX_FILE_RMDIR_ERR',
-    '-522000' => 'UNIX_FILE_OPENDIR_ERR',
-    '-523000' => 'UNIX_FILE_CLOSEDIR_ERR',
-    '-524000' => 'UNIX_FILE_READDIR_ERR',
-    '-525000' => 'UNIX_FILE_STAGE_ERR',
-    '-526000' => 'UNIX_FILE_GET_FS_FREESPACE_ERR',
-    '-527000' => 'UNIX_FILE_CHMOD_ERR',
-    '-528000' => 'UNIX_FILE_RENAME_ERR',
-    '-801000' => 'CATALOG_NOT_CONNECTED',
-    '-802000' => 'CAT_ENV_ERR',
-    '-803000' => 'CAT_CONNECT_ERR',
-    '-804000' => 'CAT_DISCONNECT_ERR',
-    '-805000' => 'CAT_CLOSE_ENV_ERR',
-    '-806000' => 'CAT_SQL_ERR',
-    '-807000' => 'CAT_GET_ROW_ERR',
-    '-808000' => 'CAT_NO_ROWS_FOUND',
-    '-809000' => 'CATALOG_ALREADY_HAS_ITEM_BY_THAT_NAME',
-    '-810000' => 'CAT_INVALID_RESOURCE_TYPE',
-    '-811000' => 'CAT_INVALID_RESOURCE_CLASS',
-    '-812000' => 'CAT_INVALID_RESOURCE_NET_ADDR',
-    '-813000' => 'CAT_INVALID_RESOURCE_VAULT_PATH',
-    '-814000' => 'CAT_UNKNOWN_COLLECTION',
-    '-815000' => 'CAT_INVALID_DATA_TYPE',
-    '-816000' => 'CAT_INVALID_ARGUMENT',
-    '-817000' => 'CAT_UNKNOWN_FILE',
-    '-818000' => 'CAT_NO_ACCESS_PERMISSION',
-    '-819000' => 'CAT_SUCCESS_BUT_WITH_NO_INFO',
-    '-820000' => 'CAT_INVALID_USER_TYPE',
-    '-821000' => 'CAT_COLLECTION_NOT_EMPTY',
-    '-822000' => 'CAT_TOO_MANY_TABLES',
-    '-823000' => 'CAT_UNKNOWN_TABLE',
-    '-824000' => 'CAT_NOT_OPEN',
-    '-825000' => 'CAT_FAILED_TO_LINK_TABLES',
-    '-826000' => 'CAT_INVALID_AUTHENTICATION',
-    '-827000' => 'CAT_INVALID_USER',
-    '-828000' => 'CAT_INVALID_ZONE',
-    '-829000' => 'CAT_INVALID_GROUP',
-    '-830000' => 'CAT_INSUFFICIENT_PRIVILEGE_LEVEL',
-    '-831000' => 'CAT_INVALID_RESOURCE',
-    '-832000' => 'CAT_INVALID_CLIENT_USER',
-    '-833000' => 'CAT_NAME_EXISTS_AS_COLLECTION',
-    '-834000' => 'CAT_NAME_EXISTS_AS_DATAOBJ',
-    '-835000' => 'CAT_RESOURCE_NOT_EMPTY',
-    '-836000' => 'CAT_NOT_A_DATAOBJ_AND_NOT_A_COLLECTION',
-    '-837000' => 'CAT_RECURSIVE_MOVE',
-    '-838000' => 'CAT_LAST_REPLICA',
-    '-839000' => 'CAT_OCI_ERROR',
-    '-840000' => 'CAT_PASSWORD_EXPIRED',
-    '-900000' => 'FILE_OPEN_ERR',
-    '-901000' => 'FILE_READ_ERR',
-    '-902000' => 'FILE_WRITE_ERR',
-    '-903000' => 'PASSWORD_EXCEEDS_MAX_SIZE',
-    '-904000' => 'ENVIRONMENT_VAR_HOME_NOT_DEFINED',
-    '-905000' => 'UNABLE_TO_STAT_FILE',
-    '-906000' => 'AUTH_FILE_NOT_ENCRYPTED',
-    '-907000' => 'AUTH_FILE_DOES_NOT_EXIST',
-    '-908000' => 'UNLINK_FAILED',
-    '-909000' => 'NO_PASSWORD_ENTERED',
-    '-1000000' => 'OBJPATH_EMPTY_IN_STRUCT_ERR',
-    '-1001000' => 'RESCNAME_EMPTY_IN_STRUCT_ERR',
-    '-1002000' => 'DATATYPE_EMPTY_IN_STRUCT_ERR',
-    '-1003000' => 'DATASIZE_EMPTY_IN_STRUCT_ERR',
-    '-1004000' => 'CHKSUM_EMPTY_IN_STRUCT_ERR',
-    '-1005000' => 'VERSION_EMPTY_IN_STRUCT_ERR',
-    '-1006000' => 'FILEPATH_EMPTY_IN_STRUCT_ERR',
-    '-1007000' => 'REPLNUM_EMPTY_IN_STRUCT_ERR',
-    '-1008000' => 'REPLSTATUS_EMPTY_IN_STRUCT_ERR',
-    '-1009000' => 'DATAOWNER_EMPTY_IN_STRUCT_ERR',
-    '-1010000' => 'DATAOWNERZONE_EMPTY_IN_STRUCT_ERR',
-    '-1011000' => 'DATAEXPIRY_EMPTY_IN_STRUCT_ERR',
-    '-1012000' => 'DATACOMMENTS_EMPTY_IN_STRUCT_ERR',
-    '-1013000' => 'DATACREATE_EMPTY_IN_STRUCT_ERR',
-    '-1014000' => 'DATAMODIFY_EMPTY_IN_STRUCT_ERR',
-    '-1015000' => 'DATAACCESS_EMPTY_IN_STRUCT_ERR',
-    '-1016000' => 'DATAACCESSINX_EMPTY_IN_STRUCT_ERR',
-    '-1017000' => 'NO_RULE_FOUND_ERR',
-    '-1018000' => 'NO_MORE_RULES_ERR',
-    '-1019000' => 'UNMATCHED_ACTION_ERR',
-    '-1020000' => 'RULES_FILE_READ_ERROR',
-    '-1021000' => 'ACTION_ARG_COUNT_MISMATCH',
-    '-1022000' => 'MAX_NUM_OF_ARGS_IN_ACTION_EXCEEDED',
-    '-1023000' => 'UNKNOWN_PARAM_IN_RULE_ERR',
-    '-1024000' => 'DESTRESCNAME_EMPTY_IN_STRUCT_ERR',
-    '-1025000' => 'BACKUPRESCNAME_EMPTY_IN_STRUCT_ERR',
-    '-1026000' => 'DATAID_EMPTY_IN_STRUCT_ERR',
-    '-1027000' => 'COLLID_EMPTY_IN_STRUCT_ERR',
-    '-1028000' => 'RESCGROUPNAME_EMPTY_IN_STRUCT_ERR',
-    '-1029000' => 'STATUSSTRING_EMPTY_IN_STRUCT_ERR',
-    '-1030000' => 'DATAMAPID_EMPTY_IN_STRUCT_ERR',
-    '-1031000' => 'USERNAMECLIENT_EMPTY_IN_STRUCT_ERR',
-    '-1032000' => 'RODSZONECLIENT_EMPTY_IN_STRUCT_ERR',
-    '-1033000' => 'USERTYPECLIENT_EMPTY_IN_STRUCT_ERR',
-    '-1034000' => 'HOSTCLIENT_EMPTY_IN_STRUCT_ERR',
-    '-1035000' => 'AUTHSTRCLIENT_EMPTY_IN_STRUCT_ERR',
-    '-1036000' => 'USERAUTHSCHEMECLIENT_EMPTY_IN_STRUCT_ERR',
-    '-1037000' => 'USERINFOCLIENT_EMPTY_IN_STRUCT_ERR',
-    '-1038000' => 'USERCOMMENTCLIENT_EMPTY_IN_STRUCT_ERR',
-    '-1039000' => 'USERCREATECLIENT_EMPTY_IN_STRUCT_ERR',
-    '-1040000' => 'USERMODIFYCLIENT_EMPTY_IN_STRUCT_ERR',
-    '-1041000' => 'USERNAMEPROXY_EMPTY_IN_STRUCT_ERR',
-    '-1042000' => 'RODSZONEPROXY_EMPTY_IN_STRUCT_ERR',
-    '-1043000' => 'USERTYPEPROXY_EMPTY_IN_STRUCT_ERR',
-    '-1044000' => 'HOSTPROXY_EMPTY_IN_STRUCT_ERR',
-    '-1045000' => 'AUTHSTRPROXY_EMPTY_IN_STRUCT_ERR',
-    '-1046000' => 'USERAUTHSCHEMEPROXY_EMPTY_IN_STRUCT_ERR',
-    '-1047000' => 'USERINFOPROXY_EMPTY_IN_STRUCT_ERR',
-    '-1048000' => 'USERCOMMENTPROXY_EMPTY_IN_STRUCT_ERR',
-    '-1049000' => 'USERCREATEPROXY_EMPTY_IN_STRUCT_ERR',
-    '-1050000' => 'USERMODIFYPROXY_EMPTY_IN_STRUCT_ERR',
-    '-1051000' => 'COLLNAME_EMPTY_IN_STRUCT_ERR',
-    '-1052000' => 'COLLPARENTNAME_EMPTY_IN_STRUCT_ERR',
-    '-1053000' => 'COLLOWNERNAME_EMPTY_IN_STRUCT_ERR',
-    '-1054000' => 'COLLOWNERZONE_EMPTY_IN_STRUCT_ERR',
-    '-1055000' => 'COLLEXPIRY_EMPTY_IN_STRUCT_ERR',
-    '-1056000' => 'COLLCOMMENTS_EMPTY_IN_STRUCT_ERR',
-    '-1057000' => 'COLLCREATE_EMPTY_IN_STRUCT_ERR',
-    '-1058000' => 'COLLMODIFY_EMPTY_IN_STRUCT_ERR',
-    '-1059000' => 'COLLACCESS_EMPTY_IN_STRUCT_ERR',
-    '-1060000' => 'COLLACCESSINX_EMPTY_IN_STRUCT_ERR',
-    '-1062000' => 'COLLMAPID_EMPTY_IN_STRUCT_ERR',
-    '-1063000' => 'COLLINHERITANCE_EMPTY_IN_STRUCT_ERR',
-    '-1065000' => 'RESCZONE_EMPTY_IN_STRUCT_ERR',
-    '-1066000' => 'RESCLOC_EMPTY_IN_STRUCT_ERR',
-    '-1067000' => 'RESCTYPE_EMPTY_IN_STRUCT_ERR',
-    '-1068000' => 'RESCTYPEINX_EMPTY_IN_STRUCT_ERR',
-    '-1069000' => 'RESCCLASS_EMPTY_IN_STRUCT_ERR',
-    '-1070000' => 'RESCCLASSINX_EMPTY_IN_STRUCT_ERR',
-    '-1071000' => 'RESCVAULTPATH_EMPTY_IN_STRUCT_ERR',
-    '-1072000' => 'NUMOPEN_ORTS_EMPTY_IN_STRUCT_ERR',
-    '-1073000' => 'PARAOPR_EMPTY_IN_STRUCT_ERR',
-    '-1074000' => 'RESCID_EMPTY_IN_STRUCT_ERR',
-    '-1075000' => 'GATEWAYADDR_EMPTY_IN_STRUCT_ERR',
-    '-1076000' => 'RESCMAX_BJSIZE_EMPTY_IN_STRUCT_ERR',
-    '-1077000' => 'FREESPACE_EMPTY_IN_STRUCT_ERR',
-    '-1078000' => 'FREESPACETIME_EMPTY_IN_STRUCT_ERR',
-    '-1079000' => 'FREESPACETIMESTAMP_EMPTY_IN_STRUCT_ERR',
-    '-1080000' => 'RESCINFO_EMPTY_IN_STRUCT_ERR',
-    '-1081000' => 'RESCCOMMENTS_EMPTY_IN_STRUCT_ERR',
-    '-1082000' => 'RESCCREATE_EMPTY_IN_STRUCT_ERR',
-    '-1083000' => 'RESCMODIFY_EMPTY_IN_STRUCT_ERR',
-    '-1084000' => 'INPUT_ARG_NOT_WELL_FORMED_ERR',
-    '-1085000' => 'INPUT_ARG_OUT_OF_ARGC_RANGE_ERR',
-    '-1086000' => 'INSUFFICIENT_INPUT_ARG_ERR',
-    '-1087000' => 'INPUT_ARG_DOES_NOT_MATCH_ERR',
-    '-1088000' => 'RETRY_WITHOUT_RECOVERY_ERR',
-    '-1089000' => 'CUT_ACTION_PROCESSED_ERR',
-    '-1090000' => 'ACTION_FAILED_ERR',
-    '-1091000' => 'FAIL_ACTION_ENCOUNTERED_ERR',
-    '-1092000' => 'VARIABLE_NAME_TOO_LONG_ERR',
-    '-1093000' => 'UNKNOWN_VARIABLE_MAP_ERR',
-    '-1094000' => 'UNDEFINED_VARIABLE_MAP_ERR',
-    '-1095000' => 'NULL_VALUE_ERR',
-    '-1096000' => 'DVARMAP_FILE_READ_ERROR',
-    '-1097000' => 'NO_RULE_OR_MSI_FUNCTION_FOUND_ERR',
-    '-1098000' => 'FILE_CREATE_ERROR',
-    '-1099000' => 'FMAP_FILE_READ_ERROR',
-    '-1100000' => 'DATE_FORMAT_ERR',
-    '-1101000' => 'RULE_FAILED_ERR',
-    '-1102000' => 'NO_MICROSERVICE_FOUND_ERR',
-    '-1103000' => 'INVALID_REGEXP',
-    '-1104000' => 'INVALID_OBJECT_NAME',
-    '-1105000' => 'INVALID_OBJECT_TYPE',
-    '-1106000' => 'NO_VALUES_FOUND',
-    '-1107000' => 'NO_COLUMN_NAME_FOUND',
-    '-99999996' => 'SYS_NULL_INPUT',
-    '-99999997' => 'SYS_HANDLER_DONE_WITH_ERROR',
-    '-99999998' => 'SYS_HANDLER_DONE_NO_ERROR',
-    '-99999999' => 'SYS_NO_HANDLER_REPLY_MSG',
-    '-3000000' => 'GENERAL_PRODS_ERR',
-    '-3100000' => 'PERR_INTERNAL_ERR',
-    '-3101000' => 'PERR_UNEXPECTED_PACKET_FORMAT',
-    '-3102000' => 'PERR_PATH_DOES_NOT_EXISTS',
-    '-3103000' => 'PERR_UNSUPPORTED_PROTOCOL_SCHEME',
-    '-3104000' => 'PERR_USER_INPUT_ERROR',
-    '-3105000' => 'PERR_USER_INPUT_PATH_ERROR',
-    '-3106000' => 'PERR_CONN_NOT_ACTIVE',
-    '-2100000' => 'SSL_NOT_BUILT_INTO_CLIENT',
-    '-2101000' => 'SSL_NOT_BUILT_INTO_SERVER',
-    '-2102000' => 'SSL_INIT_ERROR',
-    '-2103000' => 'SSL_HANDSHAKE_ERROR',
-    '-2104000' => 'SSL_SHUTDOWN_ERROR',
-    '-2105000' => 'SSL_CERT_ERROR',
-    '-991000' => 'PAM_AUTH_NOT_BUILT_INTO_CLIENT',
-    '-992000' => 'PAM_AUTH_NOT_BUILT_INTO_SERVER',
-    '-993000' => 'PAM_AUTH_PASSWORD_FAILED',
-    '-994000' => 'PAM_AUTH_PASSWORD_INVALID_TTL',
-);
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php
deleted file mode 100644
index 55ad02e3b8..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/* This file is generated by setRodsGenQueryKeyWd.php   Please modify that file if you wish to update the    Gen Query keywords.            */
-$GLOBALS['PRODS_GENQUE_KEYWD'] = array(
-    'ALL_KW' => "all",
-    'COPIES_KW' => "copies",
-    'EXEC_LOCALLY_KW' => "execLocally",
-    'FORCE_FLAG_KW' => "forceFlag",
-    'CLI_IN_SVR_FIREWALL_KW' => "cliInSvrFirewall",
-    'REG_CHKSUM_KW' => "regChksum",
-    'VERIFY_CHKSUM_KW' => "verifyChksum",
-    'VERIFY_BY_SIZE_KW' => "verifyBySize",
-    'OBJ_PATH_KW' => "objPath",
-    'RESC_NAME_KW' => "rescName",
-    'DEST_RESC_NAME_KW' => "destRescName",
-    'BACKUP_RESC_NAME_KW' => "backupRescName",
-    'DATA_TYPE_KW' => "dataType",
-    'DATA_SIZE_KW' => "dataSize",
-    'CHKSUM_KW' => "chksum",
-    'VERSION_KW' => "version",
-    'FILE_PATH_KW' => "filePath",
-    'REPL_NUM_KW' => "replNum",
-    'REPL_STATUS_KW' => "replStatus",
-    'ALL_REPL_STATUS_KW' => "allReplStatus",
-    'DATA_INCLUDED_KW' => "dataIncluded",
-    'DATA_OWNER_KW' => "dataOwner",
-    'DATA_OWNER_ZONE_KW' => "dataOwnerZone",
-    'DATA_EXPIRY_KW' => "dataExpiry",
-    'DATA_COMMENTS_KW' => "dataComments",
-    'DATA_CREATE_KW' => "dataCreate",
-    'DATA_MODIFY_KW' => "dataModify",
-    'DATA_ACCESS_KW' => "dataAccess",
-    'DATA_ACCESS_INX_KW' => "dataAccessInx",
-    'NO_OPEN_FLAG_KW' => "noOpenFlag",
-    'STREAMING_KW' => "streaming",
-    'DATA_ID_KW' => "dataId",
-    'COLL_ID_KW' => "collId",
-    'RESC_GROUP_NAME_KW' => "rescGroupName",
-    'STATUS_STRING_KW' => "statusString",
-    'DATA_MAP_ID_KW' => "dataMapId",
-    'NO_PARA_OP_KW' => "noParaOpr",
-    'LOCAL_PATH_KW' => "localPath",
-    'RSYNC_MODE_KW' => "rsyncMode",
-    'RSYNC_DEST_PATH_KW' => "rsyncDestPath",
-    'RSYNC_CHKSUM_KW' => "rsyncChksum",
-    'CHKSUM_ALL_KW' => "ChksumAll",
-    'FORCE_CHKSUM_KW' => "forceChksum",
-    'COLLECTION_KW' => "collection",
-    'IRODS_ADMIN_KW' => "irodsAdmin",
-    'RESC_ZONE_KW' => "zoneName",
-    'RESC_LOC_KW' => "rescLoc",
-    'RESC_TYPE_KW' => "rescType",
-    'RESC_CLASS_KW' => "rescClass",
-    'RESC_VAULT_PATH_KW' => "rescVaultPath",
-    'NUM_OPEN_PORTS_KW' => "numOpenPorts",
-    'PARA_OPR_KW' => "paraOpr",
-    'GATEWAY_ADDR_KW' => "gateWayAddr",
-    'RESC_MAX_OBJ_SIZE_KW' => "rescMaxObjSize",
-    'FREE_SPACE_KW' => "freeSpace",
-    'FREE_SPACE_TIME_KW' => "freeSpaceTime",
-    'FREE_SPACE_TIMESTAMP_KW' => "freeSpaceTimeStamp",
-    'RESC_TYPE_INX_KW' => "rescTypeInx",
-    'RESC_CLASS_INX_KW' => "rescClassInx",
-    'RESC_ID_KW' => "rescId",
-    'RESC_INFO_KW' => "rescInfo",
-    'RESC_COMMENTS_KW' => "rescComments",
-    'RESC_CREATE_KW' => "rescCreate",
-    'RESC_MODIFY_KW' => "rescModify",
-    'USER_NAME_CLIENT_KW' => "userNameClient",
-    'RODS_ZONE_CLIENT_KW' => "rodsZoneClient",
-    'HOST_CLIENT_KW' => "hostClient",
-    'USER_TYPE_CLIENT_KW' => "userTypeClient",
-    'AUTH_STR_CLIENT_KW' => "authStrClient",
-    'USER_AUTH_SCHEME_CLIENT_KW' => "userAuthSchemeClient",
-    'USER_INFO_CLIENT_KW' => "userInfoClient",
-    'USER_COMMENT_CLIENT_KW' => "userCommentClient",
-    'USER_CREATE_CLIENT_KW' => "userCreateClient",
-    'USER_MODIFY_CLIENT_KW' => "userModifyClient",
-    'USER_NAME_PROXY_KW' => "userNameProxy",
-    'RODS_ZONE_PROXY_KW' => "rodsZoneProxy",
-    'HOST_PROXY_KW' => "hostProxy",
-    'USER_TYPE_PROXY_KW' => "userTypeProxy",
-    'AUTH_STR_PROXY_KW' => "authStrProxy",
-    'USER_AUTH_SCHEME_PROXY_KW' => "userAuthSchemeProxy",
-    'USER_INFO_PROXY_KW' => "userInfoProxy",
-    'USER_COMMENT_PROXY_KW' => "userCommentProxy",
-    'USER_CREATE_PROXY_KW' => "userCreateProxy",
-    'USER_MODIFY_PROXY_KW' => "userModifyProxy",
-    'ACCESS_PERMISSION_KW' => "accessPermission",
-    'COLL_NAME_KW' => "collName",
-    'COLL_PARENT_NAME_KW' => "collParentName",
-    'COLL_OWNER_NAME_KW' => "collOwnername",
-    'COLL_OWNER_ZONE_KW' => "collOwnerZone",
-    'COLL_MAP_ID_KW' => "collMapId",
-    'COLL_INHERITANCE_KW' => "collInheritance",
-    'COLL_COMMENTS_KW' => "collComments",
-    'COLL_EXPIRY_KW' => "collExpiry",
-    'COLL_CREATE_KW' => "collCreate",
-    'COLL_MODIFY_KW' => "collModify",
-    'COLL_ACCESS_KW' => "collAccess",
-    'COLL_ACCESS_INX_KW' => "collAccessInx",
-    'COLL_ID_KW' => "collId",
-    'RULE_NAME_KW' => "ruleName",
-    'RULE_REI_FILE_PATH_KW' => "reiFilePath",
-    'RULE_USER_NAME_KW' => "userName",
-    'RULE_EXE_ADDRESS_KW' => "exeAddress",
-    'RULE_EXE_TIME_KW' => "exeTime",
-    'RULE_EXE_FREQUENCY_KW' => "exeFrequency",
-    'RULE_PRIORITY_KW' => "priority",
-    'RULE_ESTIMATE_EXE_TIME_KW' => "estimateExeTime",
-    'RULE_NOTIFICATION_ADDR_KW' => "notificationAddr",
-    'RULE_LAST_EXE_TIME_KW' => "lastExeTime",
-    'RULE_EXE_STATUS_KW' => "exeStatus",
-);
-$GLOBALS['PRODS_GENQUE_KEYWD_REV'] = array(
-    "all" => 'ALL_KW',
-    "copies" => 'COPIES_KW',
-    "execLocally" => 'EXEC_LOCALLY_KW',
-    "forceFlag" => 'FORCE_FLAG_KW',
-    "cliInSvrFirewall" => 'CLI_IN_SVR_FIREWALL_KW',
-    "regChksum" => 'REG_CHKSUM_KW',
-    "verifyChksum" => 'VERIFY_CHKSUM_KW',
-    "verifyBySize" => 'VERIFY_BY_SIZE_KW',
-    "objPath" => 'OBJ_PATH_KW',
-    "rescName" => 'RESC_NAME_KW',
-    "destRescName" => 'DEST_RESC_NAME_KW',
-    "backupRescName" => 'BACKUP_RESC_NAME_KW',
-    "dataType" => 'DATA_TYPE_KW',
-    "dataSize" => 'DATA_SIZE_KW',
-    "chksum" => 'CHKSUM_KW',
-    "version" => 'VERSION_KW',
-    "filePath" => 'FILE_PATH_KW',
-    "replNum" => 'REPL_NUM_KW',
-    "replStatus" => 'REPL_STATUS_KW',
-    "allReplStatus" => 'ALL_REPL_STATUS_KW',
-    "dataIncluded" => 'DATA_INCLUDED_KW',
-    "dataOwner" => 'DATA_OWNER_KW',
-    "dataOwnerZone" => 'DATA_OWNER_ZONE_KW',
-    "dataExpiry" => 'DATA_EXPIRY_KW',
-    "dataComments" => 'DATA_COMMENTS_KW',
-    "dataCreate" => 'DATA_CREATE_KW',
-    "dataModify" => 'DATA_MODIFY_KW',
-    "dataAccess" => 'DATA_ACCESS_KW',
-    "dataAccessInx" => 'DATA_ACCESS_INX_KW',
-    "noOpenFlag" => 'NO_OPEN_FLAG_KW',
-    "streaming" => 'STREAMING_KW',
-    "dataId" => 'DATA_ID_KW',
-    "collId" => 'COLL_ID_KW',
-    "rescGroupName" => 'RESC_GROUP_NAME_KW',
-    "statusString" => 'STATUS_STRING_KW',
-    "dataMapId" => 'DATA_MAP_ID_KW',
-    "noParaOpr" => 'NO_PARA_OP_KW',
-    "localPath" => 'LOCAL_PATH_KW',
-    "rsyncMode" => 'RSYNC_MODE_KW',
-    "rsyncDestPath" => 'RSYNC_DEST_PATH_KW',
-    "rsyncChksum" => 'RSYNC_CHKSUM_KW',
-    "ChksumAll" => 'CHKSUM_ALL_KW',
-    "forceChksum" => 'FORCE_CHKSUM_KW',
-    "collection" => 'COLLECTION_KW',
-    "irodsAdmin" => 'IRODS_ADMIN_KW',
-    "zoneName" => 'RESC_ZONE_KW',
-    "rescLoc" => 'RESC_LOC_KW',
-    "rescType" => 'RESC_TYPE_KW',
-    "rescClass" => 'RESC_CLASS_KW',
-    "rescVaultPath" => 'RESC_VAULT_PATH_KW',
-    "numOpenPorts" => 'NUM_OPEN_PORTS_KW',
-    "paraOpr" => 'PARA_OPR_KW',
-    "gateWayAddr" => 'GATEWAY_ADDR_KW',
-    "rescMaxObjSize" => 'RESC_MAX_OBJ_SIZE_KW',
-    "freeSpace" => 'FREE_SPACE_KW',
-    "freeSpaceTime" => 'FREE_SPACE_TIME_KW',
-    "freeSpaceTimeStamp" => 'FREE_SPACE_TIMESTAMP_KW',
-    "rescTypeInx" => 'RESC_TYPE_INX_KW',
-    "rescClassInx" => 'RESC_CLASS_INX_KW',
-    "rescId" => 'RESC_ID_KW',
-    "rescInfo" => 'RESC_INFO_KW',
-    "rescComments" => 'RESC_COMMENTS_KW',
-    "rescCreate" => 'RESC_CREATE_KW',
-    "rescModify" => 'RESC_MODIFY_KW',
-    "userNameClient" => 'USER_NAME_CLIENT_KW',
-    "rodsZoneClient" => 'RODS_ZONE_CLIENT_KW',
-    "hostClient" => 'HOST_CLIENT_KW',
-    "userTypeClient" => 'USER_TYPE_CLIENT_KW',
-    "authStrClient" => 'AUTH_STR_CLIENT_KW',
-    "userAuthSchemeClient" => 'USER_AUTH_SCHEME_CLIENT_KW',
-    "userInfoClient" => 'USER_INFO_CLIENT_KW',
-    "userCommentClient" => 'USER_COMMENT_CLIENT_KW',
-    "userCreateClient" => 'USER_CREATE_CLIENT_KW',
-    "userModifyClient" => 'USER_MODIFY_CLIENT_KW',
-    "userNameProxy" => 'USER_NAME_PROXY_KW',
-    "rodsZoneProxy" => 'RODS_ZONE_PROXY_KW',
-    "hostProxy" => 'HOST_PROXY_KW',
-    "userTypeProxy" => 'USER_TYPE_PROXY_KW',
-    "authStrProxy" => 'AUTH_STR_PROXY_KW',
-    "userAuthSchemeProxy" => 'USER_AUTH_SCHEME_PROXY_KW',
-    "userInfoProxy" => 'USER_INFO_PROXY_KW',
-    "userCommentProxy" => 'USER_COMMENT_PROXY_KW',
-    "userCreateProxy" => 'USER_CREATE_PROXY_KW',
-    "userModifyProxy" => 'USER_MODIFY_PROXY_KW',
-    "accessPermission" => 'ACCESS_PERMISSION_KW',
-    "collName" => 'COLL_NAME_KW',
-    "collParentName" => 'COLL_PARENT_NAME_KW',
-    "collOwnername" => 'COLL_OWNER_NAME_KW',
-    "collOwnerZone" => 'COLL_OWNER_ZONE_KW',
-    "collMapId" => 'COLL_MAP_ID_KW',
-    "collInheritance" => 'COLL_INHERITANCE_KW',
-    "collComments" => 'COLL_COMMENTS_KW',
-    "collExpiry" => 'COLL_EXPIRY_KW',
-    "collCreate" => 'COLL_CREATE_KW',
-    "collModify" => 'COLL_MODIFY_KW',
-    "collAccess" => 'COLL_ACCESS_KW',
-    "collAccessInx" => 'COLL_ACCESS_INX_KW',
-    "collId" => 'COLL_ID_KW',
-    "ruleName" => 'RULE_NAME_KW',
-    "reiFilePath" => 'RULE_REI_FILE_PATH_KW',
-    "userName" => 'RULE_USER_NAME_KW',
-    "exeAddress" => 'RULE_EXE_ADDRESS_KW',
-    "exeTime" => 'RULE_EXE_TIME_KW',
-    "exeFrequency" => 'RULE_EXE_FREQUENCY_KW',
-    "priority" => 'RULE_PRIORITY_KW',
-    "estimateExeTime" => 'RULE_ESTIMATE_EXE_TIME_KW',
-    "notificationAddr" => 'RULE_NOTIFICATION_ADDR_KW',
-    "lastExeTime" => 'RULE_LAST_EXE_TIME_KW',
-    "exeStatus" => 'RULE_EXE_STATUS_KW',
-);
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php
deleted file mode 100644
index a65823ec87..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/* This file is generated by setRodsGenQueryNum.php   Please modify that file if you wish to update the    Gen Query number.            */
-$GLOBALS['PRODS_GENQUE_NUMS'] = array(
-    'MAX_SQL_ATTR' => '50',
-    'MAX_SQL_ROWS' => '500',
-    'ORDER_BY' => '1024',
-    'ORDER_BY_DESC' => '2048',
-    'RETURN_TOTAL_ROW_COUNT' => '32',
-    'SELECT_MIN' => '2',
-    'SELECT_MAX' => '3',
-    'SELECT_SUM' => '4',
-    'SELECT_AVG' => '5',
-    'SELECT_COUNT' => '6',
-    'COL_ZONE_ID' => '101',
-    'COL_ZONE_NAME' => '102',
-    'COL_USER_ID' => '201',
-    'COL_USER_NAME' => '202',
-    'COL_USER_TYPE' => '203',
-    'COL_USER_ZONE' => '204',
-    'COL_USER_DN' => '205',
-    'COL_USER_INFO' => '206',
-    'COL_USER_COMMENT' => '207',
-    'COL_USER_CREATE_TIME' => '208',
-    'COL_USER_MODIFY_TIME' => '209',
-    'COL_R_RESC_ID' => '301',
-    'COL_R_RESC_NAME' => '302',
-    'COL_R_ZONE_NAME' => '303',
-    'COL_R_TYPE_NAME' => '304',
-    'COL_R_CLASS_NAME' => '305',
-    'COL_R_LOC' => '306',
-    'COL_R_VAULT_PATH' => '307',
-    'COL_R_FREE_SPACE' => '308',
-    'COL_R_RESC_INFO' => '309',
-    'COL_R_RESC_COMMENT' => '310',
-    'COL_R_CREATE_TIME' => '311',
-    'COL_R_MODIFY_TIME' => '312',
-    'COL_D_DATA_ID' => '401',
-    'COL_D_COLL_ID' => '402',
-    'COL_DATA_NAME' => '403',
-    'COL_DATA_REPL_NUM' => '404',
-    'COL_DATA_VERSION' => '405',
-    'COL_DATA_TYPE_NAME' => '406',
-    'COL_DATA_SIZE' => '407',
-    'COL_D_RESC_GROUP_NAME' => '408',
-    'COL_D_RESC_NAME' => '409',
-    'COL_D_DATA_PATH' => '410',
-    'COL_D_OWNER_NAME' => '411',
-    'COL_D_OWNER_ZONE' => '412',
-    'COL_D_REPL_STATUS' => '413',
-    'COL_D_DATA_STATUS' => '414',
-    'COL_D_DATA_CHECKSUM' => '415',
-    'COL_D_EXPIRY' => '416',
-    'COL_D_MAP_ID' => '417',
-    'COL_D_COMMENTS' => '418',
-    'COL_D_CREATE_TIME' => '419',
-    'COL_D_MODIFY_TIME' => '420',
-    'COL_COLL_ID' => '500',
-    'COL_COLL_NAME' => '501',
-    'COL_COLL_PARENT_NAME' => '502',
-    'COL_COLL_OWNER_NAME' => '503',
-    'COL_COLL_OWNER_ZONE' => '504',
-    'COL_COLL_MAP_ID' => '505',
-    'COL_COLL_INHERITANCE' => '506',
-    'COL_COLL_COMMENTS' => '507',
-    'COL_COLL_CREATE_TIME' => '508',
-    'COL_COLL_MODIFY_TIME' => '509',
-    'COL_COLL_TYPE' => '510',
-    'COL_COLL_INFO1' => '511',
-    'COL_COLL_INFO2' => '512',
-    'COL_META_DATA_ATTR_NAME' => '600',
-    'COL_META_DATA_ATTR_VALUE' => '601',
-    'COL_META_DATA_ATTR_UNITS' => '602',
-    'COL_META_DATA_ATTR_ID' => '603',
-    'COL_META_COLL_ATTR_NAME' => '610',
-    'COL_META_COLL_ATTR_VALUE' => '611',
-    'COL_META_COLL_ATTR_UNITS' => '612',
-    'COL_META_COLL_ATTR_ID' => '613',
-    'COL_META_NAMESPACE_COLL' => '620',
-    'COL_META_NAMESPACE_DATA' => '621',
-    'COL_META_NAMESPACE_RESC' => '622',
-    'COL_META_NAMESPACE_USER' => '623',
-    'COL_META_RESC_ATTR_NAME' => '630',
-    'COL_META_RESC_ATTR_VALUE' => '631',
-    'COL_META_RESC_ATTR_UNITS' => '632',
-    'COL_META_RESC_ATTR_ID' => '633',
-    'COL_META_USER_ATTR_NAME' => '640',
-    'COL_META_USER_ATTR_VALUE' => '641',
-    'COL_META_USER_ATTR_UNITS' => '642',
-    'COL_META_USER_ATTR_ID' => '643',
-    'COL_DATA_ACCESS_TYPE' => '700',
-    'COL_DATA_ACCESS_NAME' => '701',
-    'COL_DATA_TOKEN_NAMESPACE' => '702',
-    'COL_DATA_ACCESS_USER_ID' => '703',
-    'COL_DATA_ACCESS_DATA_ID' => '704',
-    'COL_RESC_GROUP_RESC_ID' => '800',
-    'COL_RESC_GROUP_NAME' => '801',
-    'COL_USER_GROUP_ID' => '900',
-    'COL_USER_GROUP_NAME' => '901',
-    'COL_RULE_EXEC_ID' => '1000',
-    'COL_RULE_EXEC_NAME' => '1001',
-    'COL_RULE_EXEC_REI_FILE_PATH' => '1002',
-    'COL_RULE_EXEC_USER_NAME' => '1003',
-    'COL_RULE_EXEC_ADDRESS' => '1004',
-    'COL_RULE_EXEC_TIME' => '1005',
-    'COL_RULE_EXEC_FREQUENCY' => '1006',
-    'COL_RULE_EXEC_PRIORITY' => '1007',
-    'COL_RULE_EXEC_ESTIMATED_EXE_TIME' => '1008',
-    'COL_RULE_EXEC_NOTIFICATION_ADDR' => '1009',
-    'COL_RULE_EXEC_LAST_EXE_TIME' => '1010',
-    'COL_RULE_EXEC_STATUS' => '1011',
-    'COL_TOKEN_NAMESPACE' => '1100',
-    'COL_TOKEN_ID' => '1101',
-    'COL_TOKEN_NAME' => '1102',
-    'COL_TOKEN_VALUE' => '1103',
-    'COL_TOKEN_VALUE2' => '1104',
-    'COL_TOKEN_VALUE3' => '1105',
-    'COL_TOKEN_COMMENT' => '1106',
-);
-$GLOBALS['PRODS_GENQUE_NUMS_REV'] = array(
-    '50' => 'MAX_SQL_ATTR',
-    '500' => 'MAX_SQL_ROWS',
-    '1024' => 'ORDER_BY',
-    '2048' => 'ORDER_BY_DESC',
-    '32' => 'RETURN_TOTAL_ROW_COUNT',
-    '2' => 'SELECT_MIN',
-    '3' => 'SELECT_MAX',
-    '4' => 'SELECT_SUM',
-    '5' => 'SELECT_AVG',
-    '6' => 'SELECT_COUNT',
-    '101' => 'COL_ZONE_ID',
-    '102' => 'COL_ZONE_NAME',
-    '201' => 'COL_USER_ID',
-    '202' => 'COL_USER_NAME',
-    '203' => 'COL_USER_TYPE',
-    '204' => 'COL_USER_ZONE',
-    '205' => 'COL_USER_DN',
-    '206' => 'COL_USER_INFO',
-    '207' => 'COL_USER_COMMENT',
-    '208' => 'COL_USER_CREATE_TIME',
-    '209' => 'COL_USER_MODIFY_TIME',
-    '301' => 'COL_R_RESC_ID',
-    '302' => 'COL_R_RESC_NAME',
-    '303' => 'COL_R_ZONE_NAME',
-    '304' => 'COL_R_TYPE_NAME',
-    '305' => 'COL_R_CLASS_NAME',
-    '306' => 'COL_R_LOC',
-    '307' => 'COL_R_VAULT_PATH',
-    '308' => 'COL_R_FREE_SPACE',
-    '309' => 'COL_R_RESC_INFO',
-    '310' => 'COL_R_RESC_COMMENT',
-    '311' => 'COL_R_CREATE_TIME',
-    '312' => 'COL_R_MODIFY_TIME',
-    '401' => 'COL_D_DATA_ID',
-    '402' => 'COL_D_COLL_ID',
-    '403' => 'COL_DATA_NAME',
-    '404' => 'COL_DATA_REPL_NUM',
-    '405' => 'COL_DATA_VERSION',
-    '406' => 'COL_DATA_TYPE_NAME',
-    '407' => 'COL_DATA_SIZE',
-    '408' => 'COL_D_RESC_GROUP_NAME',
-    '409' => 'COL_D_RESC_NAME',
-    '410' => 'COL_D_DATA_PATH',
-    '411' => 'COL_D_OWNER_NAME',
-    '412' => 'COL_D_OWNER_ZONE',
-    '413' => 'COL_D_REPL_STATUS',
-    '414' => 'COL_D_DATA_STATUS',
-    '415' => 'COL_D_DATA_CHECKSUM',
-    '416' => 'COL_D_EXPIRY',
-    '417' => 'COL_D_MAP_ID',
-    '418' => 'COL_D_COMMENTS',
-    '419' => 'COL_D_CREATE_TIME',
-    '420' => 'COL_D_MODIFY_TIME',
-    '500' => 'COL_COLL_ID',
-    '501' => 'COL_COLL_NAME',
-    '502' => 'COL_COLL_PARENT_NAME',
-    '503' => 'COL_COLL_OWNER_NAME',
-    '504' => 'COL_COLL_OWNER_ZONE',
-    '505' => 'COL_COLL_MAP_ID',
-    '506' => 'COL_COLL_INHERITANCE',
-    '507' => 'COL_COLL_COMMENTS',
-    '508' => 'COL_COLL_CREATE_TIME',
-    '509' => 'COL_COLL_MODIFY_TIME',
-    '510' => 'COL_COLL_TYPE',
-    '511' => 'COL_COLL_INFO1',
-    '512' => 'COL_COLL_INFO2',
-    '600' => 'COL_META_DATA_ATTR_NAME',
-    '601' => 'COL_META_DATA_ATTR_VALUE',
-    '602' => 'COL_META_DATA_ATTR_UNITS',
-    '603' => 'COL_META_DATA_ATTR_ID',
-    '610' => 'COL_META_COLL_ATTR_NAME',
-    '611' => 'COL_META_COLL_ATTR_VALUE',
-    '612' => 'COL_META_COLL_ATTR_UNITS',
-    '613' => 'COL_META_COLL_ATTR_ID',
-    '620' => 'COL_META_NAMESPACE_COLL',
-    '621' => 'COL_META_NAMESPACE_DATA',
-    '622' => 'COL_META_NAMESPACE_RESC',
-    '623' => 'COL_META_NAMESPACE_USER',
-    '630' => 'COL_META_RESC_ATTR_NAME',
-    '631' => 'COL_META_RESC_ATTR_VALUE',
-    '632' => 'COL_META_RESC_ATTR_UNITS',
-    '633' => 'COL_META_RESC_ATTR_ID',
-    '640' => 'COL_META_USER_ATTR_NAME',
-    '641' => 'COL_META_USER_ATTR_VALUE',
-    '642' => 'COL_META_USER_ATTR_UNITS',
-    '643' => 'COL_META_USER_ATTR_ID',
-    '700' => 'COL_DATA_ACCESS_TYPE',
-    '701' => 'COL_DATA_ACCESS_NAME',
-    '702' => 'COL_DATA_TOKEN_NAMESPACE',
-    '703' => 'COL_DATA_ACCESS_USER_ID',
-    '704' => 'COL_DATA_ACCESS_DATA_ID',
-    '800' => 'COL_RESC_GROUP_RESC_ID',
-    '801' => 'COL_RESC_GROUP_NAME',
-    '900' => 'COL_USER_GROUP_ID',
-    '901' => 'COL_USER_GROUP_NAME',
-    '1000' => 'COL_RULE_EXEC_ID',
-    '1001' => 'COL_RULE_EXEC_NAME',
-    '1002' => 'COL_RULE_EXEC_REI_FILE_PATH',
-    '1003' => 'COL_RULE_EXEC_USER_NAME',
-    '1004' => 'COL_RULE_EXEC_ADDRESS',
-    '1005' => 'COL_RULE_EXEC_TIME',
-    '1006' => 'COL_RULE_EXEC_FREQUENCY',
-    '1007' => 'COL_RULE_EXEC_PRIORITY',
-    '1008' => 'COL_RULE_EXEC_ESTIMATED_EXE_TIME',
-    '1009' => 'COL_RULE_EXEC_NOTIFICATION_ADDR',
-    '1010' => 'COL_RULE_EXEC_LAST_EXE_TIME',
-    '1011' => 'COL_RULE_EXEC_STATUS',
-    '1100' => 'COL_TOKEN_NAMESPACE',
-    '1101' => 'COL_TOKEN_ID',
-    '1102' => 'COL_TOKEN_NAME',
-    '1103' => 'COL_TOKEN_VALUE',
-    '1104' => 'COL_TOKEN_VALUE2',
-    '1105' => 'COL_TOKEN_VALUE3',
-    '1106' => 'COL_TOKEN_COMMENT',
-);
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/autoload.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/autoload.inc.php
deleted file mode 100644
index 593b901959..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/autoload.inc.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-// change this, if this code isn't "higher" than ALL classfiles
-define("CLASS_DIR", dirname(__FILE__));
-
-/**
- * autoload classes (no need to include them one by one)
- *
- * @uses classFolder()
- * @param $className string
- */
-function __autoload($className)
-{
-    $folder = classFolder($className);
-
-    if ($folder)
-        require_once($folder . $className . ".class.php");
-}
-
-/**
- * search for folders and subfolders with classes
- *
- * @param $className string
- * @param $sub string[optional]
- * @return string
- */
-function classFolder($className, $sub = "/")
-{
-    $dir = dir(CLASS_DIR . $sub);
-
-    if (file_exists(CLASS_DIR . $sub . $className . ".class.php"))
-        return CLASS_DIR . $sub;
-
-    while (false !== ($folder = $dir->read())) {
-        if ($folder != "." && $folder != "..") {
-            if (is_dir(CLASS_DIR . $sub . $folder)) {
-                $subFolder = classFolder($className, $sub . $folder . "/");
-
-                if ($subFolder)
-                    return $subFolder;
-            }
-        }
-    }
-    $dir->close();
-    return false;
-}
-
-spl_autoload_register('__autoload');
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php
deleted file mode 100644
index e5cff1f60e..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-
-//require_once(dirname(__FILE__)."/../autoload.inc.php");
-
-/*
-$GLOBALS['Pack_PI_Table']=array (
-  "MsgHeader_PI" => array ("type" => NULL, "msgLen" => 0, 
-      "errorLen" => 0, "bsLen" => 0, "intInfo" => 0),
-  "StartupPack_PI" => array ("irodsProt" => 1, "connectCnt" => 0, 
-      "proxyUser" => NULL, "proxyRcatZone" => NULL, "clientUser" => NULL,  
-      "clientRcatZone" => NULL, "relVersion" => NULL,  
-      "apiVersion" => NULL, "option" => NULL ),
-   "Version_PI" => array ("status"=>0,"relVersion"=>NULL,"apiVersion"=>NULL),
-   "authResponseInp_PI" => array("response" => NULL, "username" => NULL),
-   "authRequestOut_PI"  => array("challenge" => NULL)   
-);
-*/
-
-class RODSPacket
-{
-    protected $type; // type of packet
-    protected $packlets; // (array of mixed) main message body
-
-    public function __construct($type = NULL, array $arr = NULL)
-    {
-        if (!isset($type))
-            return;
-
-        $this->type = $type;
-        $this->packlets = $arr;
-    }
-
-    public function toXML()
-    {
-        if (empty($this->type))
-            return NULL;
-
-        $doc = new DOMDocument();
-        $root = $this->toDOMElement($doc);
-        $doc->appendChild($root);
-        return ($doc->saveXML($root, LIBXML_NOEMPTYTAG));
-    }
-
-    /*
-    public function fromXML($str)
-    {
-      try {
-        $xml = new SimpleXMLElement($str);
-      } catch (Exception $e) {
-        throw new RODSException("RODSPacket::fromXML failed. ".
-            "Mal-formated XML: '$str'\n",
-            PERR_INTERNAL_ERR);
-      }
-
-      if (isset($this->type)&&($this->type!=$xml->getName()))
-      {
-        throw new RODSException("RODSPacket::fromXML failed. ".
-            "Possible type mismatch! expected type:".$this->type." but got: ".
-            $xml->getName()." \n",
-            PERR_INTERNAL_ERR);
-      }
-
-      $this->type=$xml->getName();
-
-      foreach($xml as $key => $val)
-      {
-        if (!array_key_exists($key,$this->msg))
-        {
-          throw new RODSException("RODSPacket::fromXML failed. ".
-            "Possible type mismatch! expected key '$key' doesn't exists\n",
-            PERR_INTERNAL_ERR);
-        }
-        $this->msg[$key]=(string)$val;
-      }
-    }
-    */
-
-    public static function parseXML($xmlstr)
-    {
-        if (false == ($doc = DOMDocument::loadXML($xmlstr))) {
-            throw new RODSException("RODSPacket::parseXML failed. " .
-                    "Failed to loadXML(). The xmlstr is: $xmlstr\n",
-                PERR_UNEXPECTED_PACKET_FORMAT);
-        }
-
-        $rp_classname = "RP_" . substr($doc->tagName, 0, strlen($doc->tagName) - 3);
-        $packet = new $rp_classname();
-        $packet->fromDOM($doc);
-    }
-
-    /*
-    public function fromDOM(DOMNode $domnode)
-    {
-      if (!isset($this->packlets))
-        return;
-
-      $i=0;
-      $domnode_children=$domnode->childNodes;
-
-      foreach($this->packlets as $packlet_key => &$packlet_val)
-      {
-        $domnode_child=$domnode_children->item($i++);
-
-        // check if the tag names are expected
-        if ($domnode_child->tagName!=$packlet_key)
-        {
-          throw new RODSException("RODSPacket::fromDOM failed. ".
-            "Expecting packlet:$packlet_key, but got:".$domnode_child->tagName." \n",
-            PERR_UNEXPECTED_PACKET_FORMAT);
-        }
-
-        if (is_a($packlet_val, "RODSPacket")) //if expecting sub packet
-        {
-          $packlet_val->fromDOM($domnode_child);
-        }
-        else //if expecting an string
-        {
-
-        }
-      }
-    }
-
-    */
-
-    public function fromSXE(SimpleXMLElement $sxe)
-    {
-        if (!isset($this->packlets))
-            return;
-
-        foreach ($this->packlets as $packlet_key => &$packlet_val) {
-            if ($packlet_val instanceof RODSPacket) //if expecting sub packet
-            {
-                if (!isset($sxe->$packlet_key)) {
-                    throw new RODSException("RODSPacket(" . get_class($this) . ")::fromSXE failed. " .
-                            "Failed to find expected packlet: '$packlet_key' \n",
-                        "PERR_UNEXPECTED_PACKET_FORMAT");
-                }
-                $packlet_val->fromSXE($sxe->$packlet_key);
-            } else
-                if (is_array($packlet_val)) //if expecting array
-                {
-                    if (isset($sxe->$packlet_key)) {
-                        $packlet_val = array();
-                        foreach ($sxe->$packlet_key as $sxe_val) {
-                            if ((!empty($this->array_rp_type)) &&
-                                (!empty($this->array_rp_type["$packlet_key"]))
-                            ) // if it's an array of packets
-                            {
-                                $class_name = $this->array_rp_type[$packlet_key];
-                                $sub_array_packet = new $class_name();
-                                $sub_array_packet->fromSXE($sxe_val);
-                                $packlet_val[] = $sub_array_packet;
-                            } else {
-                                $packlet_val[] = (string)$sxe_val;
-                            }
-                        }
-                    }
-
-                } else {
-                    if (isset($sxe->$packlet_key)) {
-                        $packlet_val = (string)$sxe->$packlet_key;
-                    }
-                }
-        }
-        /*
-        foreach($sxe->children() as $child)
-        {
-          $tagname=$child->getName();
-          if(substr($tagname,-3,3)=="_PI")
-          {
-            $rp_classname="RP_".substr($name,0,strlen($name)-3);
-            $child_rp=new $rp_classname();
-            $child_rp->fromSXE($child);
-          }
-          else
-          {
-            $this->packlets[$child->getName()]=(string)$child;
-          }
-        }
-        */
-    }
-
-    public function toDOMElement(DOMDocument $doc)
-    {
-        if (empty($this->type))
-            return NULL;
-
-        $node = $doc->createElement($this->type);
-
-        foreach ($this->packlets as $name => $packlet) {
-            if ($packlet instanceof RODSPacket) //if node is a packet
-            {
-                $child_node = $packlet->toDOMElement($doc);
-                if (isset($child_node))
-                    $node->appendChild($packlet->toDOMElement($doc));
-            } else
-                if (is_array($packlet)) //if node is an array
-                {
-                    if (isset($packlet)) {
-                        foreach ($packlet as $sub_packlet) {
-                            if ($sub_packlet instanceof RODSPacket) //if sub_node is a packet
-                            {
-                                $child_node = $sub_packlet->toDOMElement($doc);
-                                if (isset($child_node))
-                                    $node->appendChild($sub_packlet->toDOMElement($doc));
-                            } else {
-                                //echo "sub_packlet = $sub_packlet<br/>\n";
-                                $node->appendChild($doc->createElement($name, htmlspecialchars($sub_packlet)));
-                            }
-                        }
-                    }
-                } else //if node holds a string
-                { //echo "packlet = $packlet<br/>\n";
-                    $node->appendChild($doc->createElement($name, htmlspecialchars($packlet)));
-                }
-        }
-
-        return $node;
-    }
-
-    public function __get($name)
-    {
-        if (array_key_exists($name, $this->packlets))
-            return $this->packlets[$name];
-        else {
-            debug_print_backtrace();
-            throw new RODSException("RODSPacket::__get() failed. Trying to access field '$name' that doesn't exist!",
-                "PERR_INTERNAL_ERR");
-        }
-    }
-
-    public function __set($name, $val)
-    {
-        if (array_key_exists($name, $this->packlets))
-            $this->packlets[$name] = $val;
-        else
-            throw new RODSException("RODSPacket::__set() failed. Trying to access field '$name' that doesn't exist!",
-                "PERR_INTERNAL_ERR");
-    }
-
-    /*
-    public static function makeStartupPack($user,$zone)
-    {
-      $msg=array(1,0,$user,$zone,$user,$zone,'rods0.5','a',NULL);
-      return (new RODSPacket("StartupPack_PI",$msg));
-    }
-    */
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php
deleted file mode 100644
index a7598bb7e6..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_BinBytesBuf extends RODSPacket
-{
-    public function __construct($buflen = '', $buf = '')
-    {
-        $packlets = array("buflen" => $buflen, "buf" => $buf);
-        parent::__construct("BinBytesBuf_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php
deleted file mode 100644
index 05c51cf56c..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-
-class RP_CollInp extends RODSPacket
-{
-    public function __construct($collName = "",
-                                RP_KeyValPair $KeyValPair_PI = NULL)
-    {
-        if (!isset($KeyValPair_PI)) $KeyValPair_PI = new RP_KeyValPair();
-
-        $packlets = array("collName" => $collName,
-            'KeyValPair_PI' => $KeyValPair_PI);
-        parent::__construct("CollInp_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php
deleted file mode 100644
index a9140050bc..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-
-class RP_CollOprStat extends RODSPacket
-{
-    public function __construct($filesCnt = 0, $totalFileCnt = 0, $bytesWritten = 0,
-                                $lastObjPath = '')
-    {
-        $packlets = array("filesCnt" => $filesCnt, "totalFileCnt" => $totalFileCnt,
-            'bytesWritten' => $bytesWritten, 'lastObjPath' => $lastObjPath);
-        parent::__construct("CollOprStat_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php
deleted file mode 100644
index 481ff34a22..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-
-class RP_DataObjCopyInp extends RODSPacket
-{
-    public function __construct(RP_DataObjInp $src = NULL,
-                                RP_DataObjInp $dest = NULL)
-    {
-        if (!isset($src)) $src = new RP_DataObjInp();
-        if (!isset($dest)) $dest = new RP_DataObjInp();
-
-        $packlets = array("src" => $src, 'dest' => $dest);
-        parent::__construct("DataObjCopyInp_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php
deleted file mode 100644
index f6200d1761..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-
-class RP_DataObjInp extends RODSPacket
-{
-    public function __construct($objPath = "", $createMode = 0, $openFlags = 0,
-                                $offset = 0, $dataSize = -1, $numThreads = 0, $oprType = 0,
-                                RP_KeyValPair $KeyValPair_PI = NULL)
-    {
-        if (!isset($KeyValPair_PI)) $KeyValPair_PI = new RP_KeyValPair();
-
-        $packlets = array("objPath" => $objPath, 'createMode' => $createMode,
-            'openFlags' => $openFlags, 'offset' => $offset, "dataSize" => $dataSize,
-            "numThreads" => $numThreads, "oprType" => $oprType,
-            'KeyValPair_PI' => $KeyValPair_PI);
-        parent::__construct("DataObjInp_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php
deleted file mode 100644
index a7559e3c25..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/* 
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/**
- * Description of RP_ExecCmdOut
- *
- * @author lisa
- */
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-
-class RP_ExecCmdOut extends RODSPacket
-{
-
-    public function __construct($buf = '', $buflen = 0)
-    {
-        $packlets = array("buf" => $buf);
-        parent::__construct("ExecCmdOut_PI", $packlets);
-    }
-
-    public function fromSXE(SimpleXMLElement $sxe)
-    {
-        $binbytes = "BinBytesBuf_PI";
-        $name = "buf";
-
-        if (!isset($this->packlets))
-            return;
-
-        $packlet_value = "";
-        try {
-            foreach ($sxe->$binbytes as $binpacket) {
-                if (strlen($binpacket->$name) > 0) {
-                    $decoded_value = base64_decode($binpacket->$name);
-                    $packlet_value .= $decoded_value;
-                }
-            }
-
-            // can't find a better way yet to get rid of the garbage on the end of the string ...
-            $len = strlen($packlet_value);
-            $cleaned_value = "";
-            for ($i = 0; $i < $len; $i++) {
-                if (ord($packlet_value{$i}) <= 0) break;
-                $cleaned_value .= $packlet_value{$i};
-            }
-
-            $this->packlets[$name] = $cleaned_value;
-            $this->packlets["buflen"] = $i;
-        } catch (Exception $ex) {
-            $this->packlets[$name] = "";
-        }
-    }
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php
deleted file mode 100644
index 2eb5dbd6ff..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_ExecMyRuleInp extends RODSPacket
-{
-    public function __construct($myRule = '', RP_RHostAddr $RHostAddr_PI = null,
-                                RP_KeyValPair $KeyValPair_PI = null, $outParamDesc = '',
-                                RP_MsParamArray $MsParamArray_PI = null)
-    {
-        if (!isset($RHostAddr_PI)) $RHostAddr_PI = new RP_RHostAddr();
-        if (!isset($KeyValPair_PI)) $KeyValPair_PI = new RP_KeyValPair();
-        if (!isset($MsParamArray_PI)) $MsParamArray_PI = new RP_MsParamArray();
-
-        $packlets = array("myRule" => $myRule, "RHostAddr_PI" => $RHostAddr_PI,
-            "KeyValPair_PI" => $KeyValPair_PI, "outParamDesc" => $outParamDesc,
-            "MsParamArray_PI" => $MsParamArray_PI);
-        parent::__construct("ExecMyRuleInp_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php
deleted file mode 100644
index cf4bf34060..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_GenQueryInp extends RODSPacket
-{
-    public function __construct($maxRows = 500, $continueInx = 0,
-                                RP_KeyValPair $KeyValPair_PI = NULL,
-                                RP_InxIvalPair $InxIvalPair_PI = NULL,
-                                RP_InxValPair $InxValPair_PI = NULL,
-                                $options = 0, $partialStartIndex = 0)
-    {
-        if (!isset($KeyValPair_PI)) $KeyValPair_PI = new RP_KeyValPair();
-        if (!isset($InxIvalPair_PI)) $InxIvalPair_PI = new RP_InxIvalPair();
-        if (!isset($InxValPair_PI)) $InxValPair_PI = new RP_InxValPair();
-
-        $packlets = array("maxRows" => $maxRows, 'continueInx' => $continueInx,
-            'partialStartIndex' => $partialStartIndex, 'options' => $options,
-            'KeyValPair_PI' => $KeyValPair_PI, 'InxIvalPair_PI' => $InxIvalPair_PI,
-            'InxValPair_PI' => $InxValPair_PI);
-        parent::__construct("GenQueryInp_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php
deleted file mode 100644
index afec88c45b..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_GenQueryOut extends RODSPacket
-{
-    // if one of the packlet is an array of packets, define it here.
-    protected $array_rp_type;
-
-    public function __construct($rowCnt = 0, $attriCnt = 0, $continueInx = 0,
-                                $totalRowCount = 0, array $SqlResult_PI = array())
-    {
-        $this->array_rp_type = array("SqlResult_PI" => "RP_SqlResult");
-
-        $packlets = array("rowCnt" => $rowCnt, 'attriCnt' => $attriCnt,
-            'continueInx' => $continueInx, 'totalRowCount' => $totalRowCount,
-            'SqlResult_PI' => $SqlResult_PI);
-        parent::__construct("GenQueryOut_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php
deleted file mode 100644
index e8af5c9fc5..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_InxIvalPair extends RODSPacket
-{
-    public function __construct($iiLen = 0, array $inx = array(), array $ivalue = array())
-    {
-        $packlets = array("iiLen" => $iiLen, 'inx' => $inx, 'ivalue' => $ivalue);
-        parent::__construct("InxIvalPair_PI", $packlets);
-    }
-
-    public function fromAssocArray($array)
-    {
-        if (!empty($array)) {
-            $this->packlets["iiLen"] = count($array);
-            $this->packlets["inx"] = array_keys($array);
-            $this->packlets["ivalue"] = array_values($array);
-        } else {
-            $this->packlets["iiLen"] = 0;
-            $this->packlets["inx"] = array();
-            $this->packlets["ivalue"] = array();
-        }
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php
deleted file mode 100644
index 4a08780f4a..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-require_once(dirname(__FILE__) . "/../RodsGenQueryNum.inc.php");
-
-class RP_InxValPair extends RODSPacket
-{
-    public function __construct($isLen = 0, array $inx = array(), array $svalue = array())
-    {
-        $packlets = array("isLen" => $isLen, 'inx' => $inx, 'svalue' => $svalue);
-        parent::__construct("InxValPair_PI", $packlets);
-    }
-
-    public function fromAssocArray($array)
-    {
-        if (!empty($array)) {
-            $this->packlets["isLen"] = count($array);
-            $this->packlets["inx"] = array_keys($array);
-            $this->packlets["svalue"] = array_values($array);
-        } else {
-            $this->packlets["isLen"] = 0;
-            $this->packlets["inx"] = array();
-            $this->packlets["svalue"] = array();
-        }
-    }
-
-    public function fromRODSQueryConditionArray($array)
-    {
-        $this->packlets["isLen"] = 0;
-        $this->packlets["inx"] = array();
-        $this->packlets["svalue"] = array();
-
-        if (!isset($array)) return;
-
-        $this->packlets["isLen"] = count($array);
-        foreach ($array as $cond) {
-            $this->packlets["inx"][] = $cond->name;
-            $this->packlets["svalue"][] = "$cond->op '$cond->value'";
-            //echo "<pre> $cond->op '$cond->value' </pre>";
-        }
-    }
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php
deleted file mode 100644
index 905d88bc8a..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_KeyValPair extends RODSPacket
-{
-    public function __construct($ssLen = 0, array $keyWord = array(), array $svalue = array())
-    {
-        if ($ssLen < 1) {
-            $keyWord = NULL;
-            $svalue = NULL;
-        }
-
-        $packlets = array("ssLen" => $ssLen, 'keyWord' => $keyWord,
-            'svalue' => $svalue);
-        parent::__construct("KeyValPair_PI", $packlets);
-    }
-
-    public function fromAssocArray(array $array)
-    {
-        if (!empty($array)) {
-            $this->packlets["ssLen"] = count($array);
-            $this->packlets["keyWord"] = array_keys($array);
-            $this->packlets["svalue"] = array_values($array);
-        } else {
-            $this->packlets["ssLen"] = 0;
-            $this->packlets["keyWord"] = array();
-            $this->packlets["svalue"] = array();
-        }
-    }
-
-    public function fromRODSQueryConditionArray($array)
-    {
-        $this->packlets["ssLen"] = 0;
-        $this->packlets["keyWord"] = array();
-        $this->packlets["svalue"] = array();
-
-        if (!isset($array)) return;
-
-        $this->packlets["ssLen"] = count($array);
-        foreach ($array as $cond) {
-            $this->packlets["keyWord"][] = $cond->name;
-            $this->packlets["svalue"][] = "$cond->op '$cond->value'";
-        }
-    }
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php
deleted file mode 100644
index 4f54c9c4e7..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-
-class RP_MiscSvrInfo extends RODSPacket
-{
-    public function __construct($serverType = 0, $relVersion = 0, $apiVersion = 0,
-                                $rodsZone = '')
-    {
-        $packlets = array("serverType" => $serverType, 'relVersion' => $relVersion,
-            'apiVersion' => $apiVersion, 'rodsZone' => $rodsZone);
-        parent::__construct("MiscSvrInfo_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php
deleted file mode 100644
index 467541734d..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_ModAVUMetadataInp extends RODSPacket
-{
-    public function __construct($arg0 = NULL, $arg1 = NULL, $arg2 = NULL,
-                                $arg3 = NULL, $arg4 = NULL, $arg5 = NULL, $arg6 = NULL, $arg7 = NULL, $arg8 = NULL,
-                                $arg9 = NULL)
-    {
-        $packlets = array("arg0" => $arg0, "arg1" => $arg1, "arg2" => $arg2,
-            "arg3" => $arg3, "arg4" => $arg4, "arg5" => $arg5,
-            "arg6" => $arg6, "arg7" => $arg7, "arg8" => $arg8, "arg9" => $arg9);
-        parent::__construct("ModAVUMetadataInp_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php
deleted file mode 100644
index fa5d4fcc3d..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_MsParam extends RODSPacket
-{
-    public function __construct($label = '', RODSPacket $inOutStruct = null,
-                                RP_BinBytesBuf $BinBytesBuf_PI = null)
-    {
-        if (!isset($BinBytesBuf_PI)) $BinBytesBuf_PI = new RP_BinBytesBuf();
-        if (!isset($inOutStruct)) $inOutStruct = new RODSPacket();
-
-        $packlets = array("label" => $label, "type" => $inOutStruct->type,
-            $inOutStruct->type => $inOutStruct, "BinBytesBuf_PI" => $BinBytesBuf_PI);
-        parent::__construct("MsParam_PI", $packlets);
-    }
-
-    // need to overwrite it's parent function here, since $inOutStruct->type
-    // can be undefined, when it's parent packet class was defined.
-    public function fromSXE(SimpleXMLElement $sxe)
-    {
-        if (!isset($this->packlets))
-            return;
-
-        $this->packlets["label"] = (string)$sxe->label;
-        $this->packlets["type"] = (string)$sxe->type;
-
-        $typename = $this->packlets["type"]; //type of the expected packet
-        if (substr($typename, -3, 3) != "_PI") {
-            throw new RODSException("RP_MsParam::fromSXE " .
-                    "The XML node's type is unexpected: '$typename' " .
-                    " expecting some thing like xxx_PI",
-                "SYS_PACK_INSTRUCT_FORMAT_ERR");
-        }
-        $rp_classname = "RP_" . substr($typename, 0, strlen($typename) - 3);
-        $inOutStruct = new $rp_classname();
-        $inOutStruct->fromSXE($sxe->$typename);
-        $this->packlets["$typename"] = $inOutStruct;
-
-        $this->packlets['BinBytesBuf_PI'] = new RP_BinBytesBuf();
-        $this->packlets['BinBytesBuf_PI']->fromSXE($sxe->BinBytesBuf_PI);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php
deleted file mode 100644
index b664abe62b..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_MsParamArray extends RODSPacket
-{
-    // if one of the packlet is an array of packets, define it here.
-    protected $array_rp_type;
-
-    public function __construct(array $MsParam_PI = array(),
-                                $oprType = 0)
-    {
-        $this->array_rp_type = array("MsParam_PI" => "RP_MsParam");
-
-        $packlets = array("paramLen" => count($MsParam_PI),
-            "oprType" => $oprType, "MsParam_PI" => $MsParam_PI);
-        parent::__construct("MsParamArray_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php
deleted file mode 100644
index f1b03f779d..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_MsgHeader extends RODSPacket
-{
-    public function __construct($type = NULL, $msgLen = 0, $errorLen = 0, $bsLen = 0,
-                                $intInfo = 0)
-    {
-        $packlets = array("type" => $type, "msgLen" => $msgLen,
-            "errorLen" => $errorLen, "bsLen" => $bsLen, "intInfo" => $intInfo);
-        parent::__construct("MsgHeader_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php
deleted file mode 100644
index 2ac70dc22c..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_RHostAddr extends RODSPacket
-{
-    public function __construct($hostAddr = '', $rodsZone = '', $port = 0)
-    {
-        $packlets = array("hostAddr" => $hostAddr, "rodsZone" => $rodsZone,
-            "port" => $port);
-        parent::__construct("RHostAddr_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php
deleted file mode 100644
index 96f427a2de..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-
-class RP_RodsObjStat extends RODSPacket
-{
-    public function __construct($objSize = 0, $objType = 0, $numCopies = 0,
-                                $dataId = -1, $chksum = NULL, $ownerName = NULL, $ownerZone = NULL,
-                                $createTime = NULL, $modifyTime = NULL)
-    {
-        $packlets = array("objSize" => $objSize, 'objType' => $objType,
-            'numCopies' => $numCopies, 'dataId' => $dataId, "chksum" => $chksum,
-            "ownerName" => $ownerName, "ownerZone" => $ownerZone,
-            'createTime' => $createTime, 'modifyTime' => $modifyTime);
-        parent::__construct("RodsObjStat_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php
deleted file mode 100644
index af7739988d..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_STR extends RODSPacket
-{
-    public function __construct($myStr = '')
-    {
-        $packlets = array("myStr" => $myStr);
-        parent::__construct("STR_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php
deleted file mode 100644
index e6ee1c3adb..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_SqlResult extends RODSPacket
-{
-    public function __construct($attriInx = 0, $reslen = 0, array $value = array())
-    {
-        $packlets = array("attriInx" => $attriInx, 'reslen' => $reslen, 'value' => $value);
-        parent::__construct("SqlResult_PI", $packlets);
-    }
-
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php
deleted file mode 100644
index 700fbd3442..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_StartupPack extends RODSPacket
-{
-    public function __construct($user = "", $zone = "", $relVersion = RODS_REL_VERSION,
-                                $apiVersion = RODS_API_VERSION, $option = NULL)
-    {
-        $packlets = array("irodsProt" => 1, "connectCnt" => 0,
-            "proxyUser" => $user, "proxyRcatZone" => $zone, "clientUser" => $user,
-            "clientRcatZone" => $zone, "relVersion" => $relVersion,
-            "apiVersion" => $apiVersion, "option" => $option);
-        parent::__construct("StartupPack_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php
deleted file mode 100644
index 5c962649df..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-
-class RP_TransStat extends RODSPacket
-{
-    public function __construct($numThreads = 0, $bytesWritten = 0)
-    {
-        $packlets = array("numThreads" => $numThreads,
-            'bytesWritten' => $bytesWritten);
-        parent::__construct("TransStat_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php
deleted file mode 100644
index 9fa9b7d1c3..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_Version extends RODSPacket
-{
-    public function __construct($status = 0, $relVersion = 'rods0.5',
-                                $apiVersion = 'a')
-    {
-        $packlets = array("status" => $status, "relVersion" => $relVersion,
-            "apiVersion" => $apiVersion);
-        parent::__construct("Version_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php
deleted file mode 100644
index a702650c0e..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_authRequestOut extends RODSPacket
-{
-    public function __construct($challenge = "")
-    {
-        $packlets = array("challenge" => $challenge);
-        parent::__construct("authRequestOut_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php
deleted file mode 100644
index 3f9cbc618f..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_authResponseInp extends RODSPacket
-{
-    public function __construct($response = "", $username = "")
-    {
-        $packlets = array("response" => $response, "username" => $username);
-        parent::__construct("authResponseInp_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php
deleted file mode 100644
index d37afe23c9..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-
-class RP_dataObjCloseInp extends RODSPacket
-{
-    public function __construct($l1descInx = -1, $bytesWritten = 0)
-    {
-        $packlets = array("l1descInx" => $l1descInx,
-            'bytesWritten' => $bytesWritten);
-        parent::__construct("dataObjCloseInp_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php
deleted file mode 100644
index 31b1235471..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-
-class RP_dataObjReadInp extends RODSPacket
-{
-    public function __construct($l1descInx = -1, $len = 0)
-    {
-        $packlets = array("l1descInx" => $l1descInx,
-            'len' => $len);
-        parent::__construct("dataObjReadInp_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php
deleted file mode 100644
index 175b7e8340..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-
-class RP_dataObjWriteInp extends RODSPacket
-{
-    public function __construct($dataObjInx = -1, $len = 0)
-    {
-        $packlets = array("dataObjInx" => $dataObjInx,
-            'len' => $len);
-        parent::__construct("dataObjWriteInp_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php
deleted file mode 100644
index 83b77f4704..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-
-class RP_fileLseekInp extends RODSPacket
-{
-    public function __construct($fileInx = -1, $offset = 0, $whence = 0)
-    {
-        $packlets = array("fileInx" => $fileInx, "offset" => $offset,
-            'whence' => $whence);
-        parent::__construct("fileLseekInp_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php
deleted file mode 100644
index 45811e7ca6..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-
-class RP_fileLseekOut extends RODSPacket
-{
-    public function __construct($offset = 0)
-    {
-        $packlets = array("offset" => $offset);
-        parent::__construct("fileLseekOut_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php
deleted file mode 100644
index 29c1001df6..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-class RP_getTempPasswordOut extends RODSPacket
-{
-    public function __construct($stringToHashWith = '')
-    {
-        $packlets = array("stringToHashWith" => $stringToHashWith);
-        parent::__construct("getTempPasswordOut_PI", $packlets);
-    }
-
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php
deleted file mode 100644
index e42ac918d4..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__)."/../autoload.inc.php");
-class RP_pamAuthRequestInp extends RODSPacket
-{
-  public function __construct($pamUser="", $pamPassword="", $timeToLive=-1)
-  {
-    $packlets=array("pamUser" => $pamUser, "pamPassword" => $pamPassword, "timeToLive" => $timeToLive);  
-    parent::__construct("pamAuthRequestInp_PI",$packlets);
-  }
-     
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php
deleted file mode 100644
index b3ec130655..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__)."/../autoload.inc.php");
-class RP_pamAuthRequestOut extends RODSPacket
-{
-  public function __construct($irodsPamPassword="")
-  {
-    $packlets=array("irodsPamPassword" => $irodsPamPassword);  
-    parent::__construct("pamAuthRequestOut_PI",$packlets);
-  }
-     
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php
deleted file mode 100644
index 26470378a7..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__)."/../autoload.inc.php");
-class RP_sslEndInp extends RODSPacket
-{
-  public function __construct($arg0="")
-  {
-    $packlets=array("arg0" => $arg0);  
-    parent::__construct("sslEndInp_PI",$packlets);
-  }
-     
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php
deleted file mode 100644
index a23756e786..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__)."/../autoload.inc.php");
-class RP_sslStartInp extends RODSPacket
-{
-  public function __construct($arg0="")
-  {
-    $packlets=array("arg0" => $arg0);  
-    parent::__construct("sslStartInp_PI",$packlets);
-  }
-     
-}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ticketAdminInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ticketAdminInp.class.php
deleted file mode 100644
index ec849b68db..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ticketAdminInp.class.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Developer: Daniel
- * Date: 11.01.13
- * Time: 16:45
- */
-
-require_once(dirname(__FILE__) . "/../autoload.inc.php");
-
-class RP_ticketAdminInp extends RODSPacket
-{
-    public function __construct($arg1 = 'session', // session -> to use it, create -> to... create!,
-                                $arg2 = '', // the actual ticket
-                                $arg3 = '', // "read" or "write" -> in case of "create" above
-                                $arg4 = '', // full path to the resource, e.g.: /tempZone/home/rods/as
-                                $arg5 = '',
-                                $arg6 = '')
-    {
-
-        $packlets = array(  'arg1' => $arg1,
-                            'arg2' => $arg2,
-                            'arg3' => $arg3,
-                            'arg4' => $arg4,
-                            'arg5' => $arg5,
-                            'arg6' => $arg6,
-                        );
-        parent::__construct('ticketAdminInp_PI', $packlets);
-    }
-
-}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/prods.ini b/apps/files_external/3rdparty/irodsphp/prods/src/prods.ini
deleted file mode 100644
index 5c81a71de7..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/prods.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-; Configuration file for the Prods API
-
-[ssl]
-; Require verification of SSL certificate used. Default "false".
-;verify_peer = "true"
-; Allow self-signed certificates. Requires verify_peer. Default "false".
-;allow_self_signed = "true"
-; Location of Certificate Authority file on local filesystem which 
-; should be used with verify_peer equal "true" to authenticate 
-; the identity of the remote peer. 
-;cafile = "/path/to/cert.pem"
-; If cafile is not specified or if the certificate is not found there, 
-; the directory pointed to by capath is searched for a suitable 
-; certificate. capath must be a correctly hashed certificate directory.
-;capath = "/path/to/certfiles"
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/release_notes.txt b/apps/files_external/3rdparty/irodsphp/prods/src/release_notes.txt
deleted file mode 100644
index 7d892eedb6..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/release_notes.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-
-*'''Project''': iRODS PHP Library PRODS and PRODS Web Browser
-*'''Date''': 11/26/2012
-*'''Release Version''': 3.2.0 Release
-*'''git tag''':  3.2.0
-
-==News==
-
-This is the consolidated and updated release of the PRODS PHP library for iRODS.  This library provides a pure-PHP interface to the iRODS system.  This library is suitable for simple and quick interfaces to the iRODS data grid, and will be maintained for stability and compatibility.  If advanced or higher-performance interfaces are desired, the Jargon Java API should be considered.  Note that PHP, Jython, JRuby, Groovy, and other JVM dynamic languages can be used with Jarogn.
-
-The PRODS PHP Web Browser is also included in this project, and remains supported.  Note that the PHP Web Browser functionality has been subsumed by the idrop-web browser and idrop-swing client. 
-
-Please go to [[https://code.renci.org/gf/project/irodsphp/] for the latest news and info.
-
-Note that the git repository is now the canonical version of the PHP code.  The code in the iRODS SVN server is deprecated and will be taken down at the 3.0.0 release point.  There may be other versions in Google Code and other places, but these should be considered obsolete.
-
-
-==Requirements==
-
-==Libraries==
-
-==Features==
-
-*[#1076] irods 3.2 release activities
-**Added a LICENSE.txt file at the top project level
-
-
-==Bug Fixes==
-
-*[#1071] php uses self-closing tags for empty HTML tags
-**Added patch suggested by community  Changing line 41 in RODSPacket.class.php (in PRods) from return ($doc->saveXML($root)); to return ($doc->saveXML($root, LIBXML_NOEMPTYTAG));
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php
deleted file mode 100644
index 98c1f6cabd..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-$PRODS_tree_root = dirname(__FILE__) . "/../../..";
-$RODS_tree_root = "/opt/sifang/iRODS";
-
-$capi_api_num_file = $RODS_tree_root . "/lib/api/include/apiNumber.h";
-$prods_api_num_file = $PRODS_tree_root . "/clients/prods/src/RodsAPINum.inc.php";
-
-
-// Add more API number here, if you wish. It will be added to the default
-// RODS API number. Note that these API number are for web server/client
-// only. RODS server does not recongnize them.
-$new_api_nums = array(//array("SOMEAPI", 40000),
-);
-
-$value_pairs = array();
-
-$lines = explode("\n", file_get_contents($capi_api_num_file));
-
-foreach ($lines as $line) {
-    if (strlen($line) < 8) continue;
-    if (substr($line, 0, 7) == '#define') {
-        $rest = trim(substr($line, 7));
-        $tokens = preg_split("/\s+/", $rest);
-        var_dump($tokens);
-        if (count($tokens) < 2)
-            continue;
-        $val1 = NULL;
-        $val2 = NULL;
-        foreach ($tokens as $token) {
-            if (strlen($token) > 1) {
-                if (empty($val1)) $val1 = trim($token);
-                else $val2 = trim($token);
-            }
-        }
-        if ((!empty($val1)) && (!empty($val2))) {
-            array_push($value_pairs, array($val1, $val2));
-        }
-    }
-}
-var_dump($value_pairs);
-foreach ($new_api_nums as $new_code_pair) {
-    if ((!is_array($new_code_pair)) || (count($new_code_pair) != 2))
-        die("unexpected new_code_pair:$new_code_pair\n");
-    array_push($value_pairs, $new_code_pair);
-}
-
-$outputstr = "<?php \n" .
-    "/* This file is generated by " . basename(__FILE__) .
-    "   Please modify that file if you wish to update the " .
-    "   API number.            */\n";
-$outputstr = $outputstr . '$GLOBALS[\'PRODS_API_NUMS\']=array(' . "\n";
-foreach ($value_pairs as $value_pair) {
-    $val1 = $value_pair[0];
-    $val2 = $value_pair[1];
-    $outputstr = $outputstr . "  '$val1' => '$val2',\n";
-}
-$outputstr = $outputstr . ");\n";
-
-$outputstr = $outputstr . '$GLOBALS[\'PRODS_API_NUMS_REV\']=array(' . "\n";
-foreach ($value_pairs as $value_pair) {
-    $val1 = $value_pair[0];
-    $val2 = $value_pair[1];
-    $outputstr = $outputstr . "  '$val2' => '$val1',\n";
-}
-$outputstr = $outputstr . ");\n";
-
-$outputstr = $outputstr . "?>\n";
-file_put_contents($prods_api_num_file, $outputstr);
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php
deleted file mode 100644
index 142b4af570..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$RODS_tree_root = dirname(__FILE__) . "/../../..";
-
-$capi_error_table_file = $RODS_tree_root . "/lib/core/include/rodsErrorTable.h";
-$prods_error_table_file = $RODS_tree_root . "/clients/prods/src/RodsErrorTable.inc.php";
-
-// Add more error code here, if you wish. It will be added to the default
-// RODS error code. Note that these errors code are for web server/client
-// only. RODS server does not recongnize them.
-$new_error_codes = array(
-    array("GENERAL_PRODS_ERR", -3000000),
-    array("PERR_INTERNAL_ERR", -3100000),
-    array("PERR_UNEXPECTED_PACKET_FORMAT", -3101000),
-    array("PERR_PATH_DOES_NOT_EXISTS", -3102000),
-    array("PERR_UNSUPPORTED_PROTOCOL_SCHEME", -3103000),
-    array("PERR_USER_INPUT_ERROR", -3104000),
-    array("PERR_USER_INPUT_PATH_ERROR", -3105000),
-    array("PERR_CONN_NOT_ACTIVE", -3106000)
-);
-
-$value_pairs = array();
-
-$lines = explode("\n", file_get_contents($capi_error_table_file));
-
-foreach ($lines as $line) {
-    if (strlen($line) < 8) continue;
-    if (substr($line, 0, 7) == '#define') {
-        $rest = trim(substr($line, 7));
-        $tokens = preg_split("/\s+/", $rest);
-        if (count($tokens) < 2)
-            continue;
-        $val1 = NULL;
-        $val2 = NULL;
-        foreach ($tokens as $token) {
-            if (strlen($token) > 3) {
-                if (empty($val1)) $val1 = trim($token);
-                else $val2 = trim($token);
-            }
-        }
-        if ((!empty($val1)) && (!empty($val2))) {
-            array_push($value_pairs, array($val1, $val2));
-        }
-    }
-}
-
-foreach ($new_error_codes as $new_code_pair) {
-    if ((!is_array($new_code_pair)) || (count($new_code_pair) != 2))
-        die("unexpected new_code_pair:$new_code_pair\n");
-    array_push($value_pairs, $new_code_pair);
-}
-
-$outputstr = "<?php \n" .
-    "/* This file is generated by setRodsErrorCodes.php. " .
-    "   Please modify that file if you wish to update the " .
-    "   error codes.            */\n";
-$outputstr = $outputstr . '$GLOBALS[\'PRODS_ERR_CODES\']=array(' . "\n";
-foreach ($value_pairs as $value_pair) {
-    $val1 = $value_pair[0];
-    $val2 = $value_pair[1];
-    $outputstr = $outputstr . "  '$val1' => '$val2',\n";
-}
-$outputstr = $outputstr . ");\n";
-
-$outputstr = $outputstr . '$GLOBALS[\'PRODS_ERR_CODES_REV\']=array(' . "\n";
-foreach ($value_pairs as $value_pair) {
-    $val1 = $value_pair[0];
-    $val2 = $value_pair[1];
-    $outputstr = $outputstr . "  '$val2' => '$val1',\n";
-}
-$outputstr = $outputstr . ");\n";
-
-$outputstr = $outputstr . "?>\n";
-file_put_contents($prods_error_table_file, $outputstr);
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php
deleted file mode 100644
index 5a5968d25a..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-$RODS_tree_root = dirname(__FILE__) . "/../../..";
-
-$capi_genque_KeyWd_file = $RODS_tree_root . "/lib/core/include/rodsKeyWdDef.h";
-$prods_genque_keywd_file = $RODS_tree_root . "/clients/prods/src/RodsGenQueryKeyWd.inc.php";
-
-// Add more Query keywd here, if you wish. It will be added to the default
-// RODS Gen Que number. Note that these number are for web server/client
-// only. RODS server does not recongnize them.
-$new_genque_keywds = array(//array("SOMEKEYWD", "SOMESTR"),
-);
-
-$value_pairs = array();
-
-$lines = explode("\n", file_get_contents($capi_genque_KeyWd_file));
-foreach ($lines as $line) {
-    if (strlen($line) < 8) continue;
-    if (substr($line, 0, 7) == '#define') {
-        $rest = trim(substr($line, 7));
-        $tokens = preg_split("/\s+/", $rest);
-        if (count($tokens) < 2)
-            continue;
-        $val1 = NULL;
-        $val2 = NULL;
-
-        foreach ($tokens as $token) {
-
-            if (strlen($token) > 1) {
-                if (empty($val1)) $val1 = trim($token);
-                else {
-
-                    if (($token{0} == '"') /*&&($token{strlen($token)-1}=='"')*/) {
-                        if (empty($val2))
-                            $val2 = trim($token);
-                    }
-                }
-            }
-        }
-        if ((!empty($val1)) && (!empty($val2))) {
-            array_push($value_pairs, array($val1, $val2));
-        }
-    }
-}
-foreach ($new_genque_keywds as $new_code_pair) {
-    if ((!is_array($new_code_pair)) || (count($new_code_pair) != 2))
-        die("unexpected new_code_pair:$new_code_pair\n");
-    array_push($value_pairs, $new_code_pair);
-}
-
-$outputstr = "<?php \n" .
-    "/* This file is generated by " . basename(__FILE__) .
-    "   Please modify that file if you wish to update the " .
-    "   Gen Query keywords.            */\n";
-$outputstr = $outputstr . '$GLOBALS[\'PRODS_GENQUE_KEYWD\']=array(' . "\n";
-foreach ($value_pairs as $value_pair) {
-    $val1 = $value_pair[0];
-    $val2 = $value_pair[1];
-    $outputstr = $outputstr . "  '$val1' => $val2,\n";
-}
-$outputstr = $outputstr . ");\n";
-
-$outputstr = $outputstr . '$GLOBALS[\'PRODS_GENQUE_KEYWD_REV\']=array(' . "\n";
-foreach ($value_pairs as $value_pair) {
-    $val1 = $value_pair[0];
-    $val2 = $value_pair[1];
-    $outputstr = $outputstr . "  $val2 => '$val1',\n";
-}
-$outputstr = $outputstr . ");\n";
-
-$outputstr = $outputstr . "?>\n";
-file_put_contents($prods_genque_keywd_file, $outputstr);
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php
deleted file mode 100644
index 0be297826e..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-$RODS_tree_root = dirname(__FILE__) . "/../../..";
-
-$capi_genque_num_file = $RODS_tree_root . "/lib/core/include/rodsGenQuery.h";
-$prods_genque_num_file = $RODS_tree_root . "/clients/prods/src/RodsGenQueryNum.inc.php";
-
-// Add more GenQue number here, if you wish. It will be added to the default
-// RODS Gen Que number. Note that these number are for web server/client
-// only. RODS server does not recongnize them.
-$new_genque_nums = array(//array("SOMENUMBER", 40000),
-);
-
-$value_pairs = array();
-
-$lines = explode("\n", file_get_contents($capi_genque_num_file));
-
-foreach ($lines as $line) {
-    if (strlen($line) < 8) continue;
-    if (substr($line, 0, 7) == '#define') {
-        $rest = trim(substr($line, 7));
-        $tokens = preg_split("/\s+/", $rest);
-        if (count($tokens) < 2)
-            continue;
-
-        $val1 = trim($tokens[0]);
-        $val2 = trim($tokens[1]);
-
-        if ((!empty($val1)) && (!empty($val2))) {
-            array_push($value_pairs, array($val1, 0 + $val2));
-        }
-    }
-}
-var_dump($value_pairs);
-foreach ($new_genque_nums as $new_code_pair) {
-    if ((!is_array($new_code_pair)) || (count($new_code_pair) != 2))
-        die("unexpected new_code_pair:$new_code_pair\n");
-    array_push($value_pairs, $new_code_pair);
-}
-
-$outputstr = "<?php \n" .
-    "/* This file is generated by " . basename(__FILE__) .
-    "   Please modify that file if you wish to update the " .
-    "   Gen Query number.            */\n";
-$outputstr = $outputstr . '$GLOBALS[\'PRODS_GENQUE_NUMS\']=array(' . "\n";
-foreach ($value_pairs as $value_pair) {
-    $val1 = $value_pair[0];
-    $val2 = $value_pair[1];
-    $outputstr = $outputstr . "  '$val1' => '$val2',\n";
-}
-$outputstr = $outputstr . ");\n";
-
-$outputstr = $outputstr . '$GLOBALS[\'PRODS_GENQUE_NUMS_REV\']=array(' . "\n";
-foreach ($value_pairs as $value_pair) {
-    $val1 = $value_pair[0];
-    $val2 = $value_pair[1];
-    $outputstr = $outputstr . "  '$val2' => '$val1',\n";
-}
-$outputstr = $outputstr . ");\n";
-
-$outputstr = $outputstr . "?>\n";
-file_put_contents($prods_genque_num_file, $outputstr);
diff --git a/apps/files_external/3rdparty/irodsphp/prods/utilities/exif2meta.php b/apps/files_external/3rdparty/irodsphp/prods/utilities/exif2meta.php
deleted file mode 100644
index 9ee9495f10..0000000000
--- a/apps/files_external/3rdparty/irodsphp/prods/utilities/exif2meta.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-// reset the connection parameters below
-$host = 'rt.sdsc.edu';
-$port = 1247;
-$user = 'rods';
-$pass = 'RODS';
-
-
-/**
- * This simple script reads JPEG/TIFF files stored in iRODS, extract
- * its EXIF information, and set it as userdefined metadata.
- * Note: EXIF php module is required for this program to work properly
- *       http://us2.php.net/manual/en/ref.exif.php
- *
- * Example: php -f exif2meta.php /tempZone/home/rods/test2/RIMG0087.jpg
- */
-
-//----------don't modify below this line!! -----------
-
-require_once("../src/Prods.inc.php");
-
-$target_file = $argv[1];
-
-try {
-    $account = new RODSAccount($host, $port, $user, $pass);
-    $irodsfile = new ProdsFile($account, $target_file, true);
-
-    $metas = $irodsfile->getMeta();
-    $metaalreadyset = false;
-    foreach ($metas as $meta) {
-        if ($meta->name == 'EXIF.ExifVersion') {
-            $metaalreadyset = true;
-            break;
-        }
-    }
-
-    if ($metaalreadyset === true) {
-        $time = '[' . date('c') . ']';
-        echo "$time 0: metadata already set for '$target_file'\n";
-        exit(0);
-    }
-
-    // download file from irods to tmp
-    $localfile = '/tmp/' . basename($target_file);
-    if (file_exists($localfile))
-        unlink($localfile);
-    $irodsfile->open("r");
-    $str = '';
-    while ((($buffer = $irodsfile->read(1024 * 1024)) != NULL) &&
-        (connection_status() == 0)) {
-        $str = $str . $buffer;
-    }
-    $irodsfile->close();
-    file_put_contents($localfile, $str);
-
-    extactExif($localfile, $irodsfile);
-
-    if (file_exists($localfile))
-        unlink($localfile);
-
-    $time = '[' . date('c') . ']';
-    echo "$time 0: '$target_file' processed!\n";
-    exit(0);
-
-} catch (Exception $e) {
-
-    if (file_exists($localfile))
-        unlink($localfile);
-
-    $time = '[' . date('c') . ']';
-    echo "$time " . $e->getCode() . ": " . "$e";
-    exit(-1);
-}
-
-
-function extactExif($localfile, $remoteRODSfile)
-{
-    $exif = exif_read_data($localfile, 'EXIF');
-    if ($exif === false) return;
-
-    foreach ($exif as $name => $val) {
-
-        // replace ascii char that can't be displayed, which causes problem in irods
-        if ((!is_array($val)) && (is_string($val)) &&
-            ((ord($val[0]) < 32) || (ord($val[0]) > 126)) &&
-            ($name != 'UserComment')
-        ) {
-            $val = '__undefined__';
-        }
-
-        if ($name == 'THUMBNAIL') {
-            foreach ($val as $tname => $tval)
-                $remoteRODSfile->addMeta(new RODSMeta(
-                    'EXIF.THUMBNAIL.' . $tname, $tval, ''));
-        } else
-            if ($name == 'COMPUTED') {
-                foreach ($val as $cname => $cval) {
-                    if ($cname == 'html') {
-                        //skip html tag, because there is a irods server bug that corrupting string with
-                        //double quotes: 'COMPUTED.html: width="3264" height="2448"'
-                    } else
-                        $remoteRODSfile->addMeta(new RODSMeta(
-                            'EXIF.COMPUTED.' . $cname, $cval, ''));
-                }
-            } else
-                if ($name == 'MakerNote') {
-                    //skip makernote
-                } else
-                    if ($name == 'ComponentsConfiguration') {
-                        //skip ComponentsConfiguration, because there is a irods server bug that corrupting string with
-
-                    } else
-                        if ($name == 'UserComment') {
-                            if (($start = strpos($val, 'GCM_TAG')) !== false) {
-                                $str = substr($val, $start + strlen('GCM_TAG'));
-                                $gcm_tokens = explode(chr(0), $str);
-                                $gcm_counter = 0;
-                                foreach ($gcm_tokens as $gcm_tag) {
-                                    if ((strlen($gcm_tag) > 0) && (preg_match('/^[' . chr(32) . '-' . chr(126) . ']+$/', $gcm_tag))) {
-                                        $remoteRODSfile->addMeta(new RODSMeta(
-                                            'EXIF.UserComment' . $gcm_counter++, $gcm_tag, ''));
-                                    }
-                                }
-                            } else {
-                                if (strlen($val) < 1)
-                                    $str = ' ';
-                                //replace no displable char
-                                $str = preg_replace('/[^' . chr(32) . '-' . chr(126) . ']+/', ' ', $val);
-                                $remoteRODSfile->addMeta(new RODSMeta(
-                                    'EXIF.UserComment', $str, ''));
-                            }
-                        } else
-                            if (is_array($val)) {
-                                foreach ($val as $cname => $cval) {
-                                    $remoteRODSfile->addMeta(new RODSMeta(
-                                        "EXIF.$name." . $cname, $cval, ''));
-                                }
-                            } else
-                                $remoteRODSfile->addMeta(new RODSMeta(
-                                    'EXIF.' . $name, $val, ''));
-    }
-}
-
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/release_notes.txt b/apps/files_external/3rdparty/irodsphp/release_notes.txt
deleted file mode 100644
index 9d109faf84..0000000000
--- a/apps/files_external/3rdparty/irodsphp/release_notes.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-*'''Project''': iRODS PHP Library PRODS and PRODS Web Browser
-*'''Date''': 06/04/2013
-*'''Release Version''': 3.3.0-beta1
-*'''git tag''':  3.3.0-beta1
-
-==News==
-
-The PRODS PHP Web Browser is also included in this project, and remains supported.  Note that the PHP Web Browser functionality has been subsumed by the idrop-web browser and idrop-swing client. 
-
-Please go to [[https://code.renci.org/gf/project/irodsphp/] for the latest news and info.
-
-Note that the git repository is now the canonical version of the PHP code.  The code in the iRODS SVN server is deprecated and will be taken down at the 3.0.0 release point.  There may be other versions in Google Code and other places, but these should be considered obsolete.
-
-Please review release notes in sub projects for details
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 0017b22caa..e8ed8950c3 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -6,6 +6,7 @@
  * later.
  * See the COPYING-README file.
  */
+$l = \OC_L10N::get('files_external');
 
 OC::$CLASSPATH['OC\Files\Storage\StreamWrapper'] = 'files_external/lib/streamwrapper.php';
 OC::$CLASSPATH['OC\Files\Storage\FTP'] = 'files_external/lib/ftp.php';
@@ -18,7 +19,6 @@ 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';
-OC::$CLASSPATH['OC\Files\Storage\iRODS'] = 'files_external/lib/irods.php';
 OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php';
 
 OCP\App::registerAdmin('files_external', 'settings');
@@ -28,41 +28,40 @@ if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == '
 
 // connecting hooks
 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',
+	'backend' => (string)$l->t('Local'),
 	'configuration' => array(
-		'datadir' => 'Location')));
+		'datadir' => (string)$l->t('Location'))));
 
 OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array(
-	'backend' => 'Amazon S3',
+	'backend' => (string)$l->t('Amazon S3'),
 	'configuration' => array(
-		'key' => 'Key',
-		'secret' => '*Secret',
-		'bucket' => 'Bucket'),
+		'key' => (string)$l->t('Key'),
+		'secret' => '*'.$l->t('Secret'),
+		'bucket' => (string)$l->t('Bucket')),
 	'has_dependencies' => true));
 
 OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array(
-	'backend' => 'Amazon S3 and compliant',
+	'backend' => (string)$l->t('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'),
+		'key' => (string)$l->t('Access Key'),
+		'secret' => '*'.$l->t('Secret Key'),
+		'bucket' => (string)$l->t('Bucket'),
+		'hostname' => '&'.$l->t('Hostname (optional)'),
+		'port' => '&'.$l->t('Port (optional)'),
+		'region' => '&'.$l->t('Region (optional)'),
+		'use_ssl' => '!'.$l->t('Enable SSL'),
+		'use_path_style' => '!'.$l->t('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',
+		'app_key' => (string)$l->t('App key'),
+		'app_secret' => '*'.$l->t('App secret'),
 		'token' => '#token',
 		'token_secret' => '#token_secret'),
 	'custom' => 'dropbox',
@@ -71,36 +70,36 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', array(
 OC_Mount_Config::registerBackend('\OC\Files\Storage\FTP', array(
 	'backend' => 'FTP',
 	'configuration' => array(
-		'host' => 'URL',
-		'user' => 'Username',
-		'password' => '*Password',
-		'root' => '&Root',
-		'secure' => '!Secure ftps://'),
+		'host' => (string)$l->t('Host'),
+		'user' => (string)$l->t('Username'),
+		'password' => '*'.$l->t('Password'),
+		'root' => '&'.$l->t('Root'),
+		'secure' => '!'.$l->t('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',
+		'client_id' => (string)$l->t('Client ID'),
+		'client_secret' => '*'.$l->t('Client secret'),
 		'token' => '#token'),
 	'custom' => 'google',
 	'has_dependencies' => true));
 
 
 OC_Mount_Config::registerBackend('\OC\Files\Storage\Swift', array(
-	'backend' => 'OpenStack Object Storage',
+	'backend' => (string)$l->t('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)',
+		'user' => (string)$l->t('Username (required)'),
+		'bucket' => (string)$l->t('Bucket (required)'),
+		'region' => '&'.$l->t('Region (optional for OpenStack Object Storage)'),
+		'key' => '*'.$l->t('API Key (required for Rackspace Cloud Files)'),
+		'tenant' => '&'.$l->t('Tenantname (required for OpenStack Object Storage)'),
+		'password' => '*'.$l->t('Password (required for OpenStack Object Storage)'),
+		'service_name' => '&'.$l->t('Service Name (required for OpenStack Object Storage)'),
+		'url' => '&'.$l->t('URL of identity endpoint (required for OpenStack Object Storage)'),
+		'timeout' => '&'.$l->t('Timeout of HTTP requests in seconds (optional)'),
 	),
 	'has_dependencies' => true));
 
@@ -109,58 +108,47 @@ 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'),
+			'host' => (string)$l->t('Host'),
+			'user' => (string)$l->t('Username'),
+			'password' => '*'.$l->t('Password'),
+			'share' => (string)$l->t('Share'),
+			'root' => '&'.$l->t('Root')),
 		'has_dependencies' => true));
 
 	OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB_OC', array(
-			'backend' => 'SMB / CIFS using OC login',
+			'backend' => (string)$l->t('SMB / CIFS using OC login'),
 			'configuration' => array(
-				'host' => 'URL',
-				'username_as_share' => '!Username as share',
-				'share' => '&Share',
-				'root' => '&Root'),
+				'host' => (string)$l->t('Host'),
+				'username_as_share' => '!'.$l->t('Username as share'),
+				'share' => '&'.$l->t('Share'),
+				'root' => '&'.$l->t('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://'),
+		'host' => (string)$l->t('URL'),
+		'user' => (string)$l->t('Username'),
+		'password' => '*'.$l->t('Password'),
+		'root' => '&'.$l->t('Root'),
+		'secure' => '!'.$l->t('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://')));
+		'host' => (string)$l->t('URL'),
+		'user' => (string)$l->t('Username'),
+		'password' => '*'.$l->t('Password'),
+		'root' => '&'.$l->t('Remote subfolder'),
+		'secure' => '!'.$l->t('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')));
+		'host' => (string)$l->t('Host'),
+		'user' => (string)$l->t('Username'),
+		'password' => '*'.$l->t('Password'),
+		'root' => '&'.$l->t('Root'))));
diff --git a/apps/files_external/l10n/af_ZA.php b/apps/files_external/l10n/af_ZA.php
index 261c44310f..f0c9c5211b 100644
--- a/apps/files_external/l10n/af_ZA.php
+++ b/apps/files_external/l10n/af_ZA.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Username" => "Gebruikersnaam",
+"Password" => "Wagwoord",
+"Share" => "Deel",
 "Users" => "Gebruikers"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ar.php b/apps/files_external/l10n/ar.php
index 5fd4e4c398..eb1150eb95 100644
--- a/apps/files_external/l10n/ar.php
+++ b/apps/files_external/l10n/ar.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "المكان",
+"Host" => "المضيف",
+"Username" => "إسم المستخدم",
+"Password" => "كلمة السر",
+"Share" => "شارك",
+"URL" => "عنوان الموقع",
 "Saved" => "حفظ",
 "Folder name" => "اسم المجلد",
 "Options" => "خيارات",
diff --git a/apps/files_external/l10n/ast.php b/apps/files_external/l10n/ast.php
index e2c02408f3..faf0388dd9 100644
--- a/apps/files_external/l10n/ast.php
+++ b/apps/files_external/l10n/ast.php
@@ -1,10 +1,70 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Llocal",
+"Location" => "Llocalización",
+"Amazon S3" => "Amazon S3",
+"Key" => "Clave",
+"Secret" => "Secretu",
+"Bucket" => "Depósitu",
+"Amazon S3 and compliant" => "Amazon S3 y compatibilidá",
+"Access Key" => "Clave d'accesu",
+"Secret Key" => "Clave Secreta",
+"Hostname (optional)" => "Nome d'equipu (opcional)",
+"Port (optional)" => "Puertu (opcional)",
+"Region (optional)" => "Rexón (opcional)",
+"Enable SSL" => "Habilitar SSL",
+"Enable Path Style" => "Habilitar Estilu de ruta",
+"App key" => "App principal",
+"App secret" => "App secreta",
+"Host" => "Sirvidor",
+"Username" => "Nome d'usuariu",
+"Password" => "Contraseña",
+"Root" => "Raíz",
+"Secure ftps://" => "Secure ftps://",
+"Client ID" => "ID de veceru",
+"Client secret" => "Veceru secretu",
+"OpenStack Object Storage" => "OpenStack Object Storage",
+"Username (required)" => "Nome d'usuariu (necesariu)",
+"Bucket (required)" => "Depósitu (necesariu)",
+"Region (optional for OpenStack Object Storage)" => "Rexón (opcional pa OpenStack Object Storage)",
+"API Key (required for Rackspace Cloud Files)" => "Clave API (necesaria pa Rackspace Cloud Files)",
+"Tenantname (required for OpenStack Object Storage)" => "Nome d'inquilín (necesariu pa OpenStack Object Storage)",
+"Password (required for OpenStack Object Storage)" => "Contraseña (necesaria pa OpenStack Object Storage)",
+"Service Name (required for OpenStack Object Storage)" => "Nome de Serviciu (necesariu pa OpenStack Object Storage)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)",
+"Timeout of HTTP requests in seconds (optional)" => "Tiempu d'espera de peticiones HTTP en segundos (opcional)",
+"Share" => "Compartir",
+"SMB / CIFS using OC login" => "SMB / CIFS usando accesu OC",
+"Username as share" => "Nome d'usuariu como Compartición",
+"URL" => "URL",
+"Secure https://" => "Secure https://",
+"Remote subfolder" => "Subcarpeta remota",
+"Access granted" => "Accesu concedíu",
+"Error configuring Dropbox storage" => "Fallu configurando l'almacenamientu de Dropbox",
+"Grant access" => "Conceder accesu",
+"Please provide a valid Dropbox app key and secret." => "Por favor, proporciona una clave válida de l'app Dropbox y una clave secreta.",
+"Error configuring Google Drive storage" => "Fallu configurando l'almacenamientu de Google Drive",
+"Saved" => "Guardáu",
+"<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 nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu 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 nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu 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\" nun ta instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.",
+"External Storage" => "Almacenamientu esternu",
 "Folder name" => "Nome de la carpeta",
+"External storage" => "Almacenamientu esternu",
 "Configuration" => "Configuración",
 "Options" => "Opciones",
+"Available for" => "Disponible pa",
+"Add storage" => "Amestar almacenamientu",
+"No user or group" => "Nengún usuariu o grupu",
+"All Users" => "Tolos usuarios",
 "Groups" => "Grupos",
 "Users" => "Usuarios",
-"Delete" => "Desaniciar"
+"Delete" => "Desaniciar",
+"Enable User External Storage" => "Habilitar almacenamientu esterno d'usuariu",
+"Allow users to mount the following external storage" => "Permitir a los usuarios montar el siguiente almacenamientu esternu",
+"SSL root certificates" => "Certificaos raíz SSL",
+"Import Root Certificate" => "Importar certificáu raíz"
 );
 $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 118da27f74..13e43314bd 100644
--- a/apps/files_external/l10n/bg_BG.php
+++ b/apps/files_external/l10n/bg_BG.php
@@ -1,5 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Място",
+"Username" => "Потребител",
+"Password" => "Парола",
+"Share" => "Споделяне",
+"URL" => "Уеб адрес",
 "Access granted" => "Достъпът е даден",
 "Grant access" => "Даване на достъп",
 "External Storage" => "Външно хранилище",
diff --git a/apps/files_external/l10n/bn_BD.php b/apps/files_external/l10n/bn_BD.php
index 6c8f577795..f1ada4b476 100644
--- a/apps/files_external/l10n/bn_BD.php
+++ b/apps/files_external/l10n/bn_BD.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "াবস্থান",
+"Host" => "হোস্ট",
+"Username" => "ব্যবহারকারী",
+"Password" => "কূটশব্দ",
+"Share" => "ভাগাভাগি কর",
+"URL" => "URL",
 "Access granted" => "অধিগমনের  অনুমতি প্রদান করা হলো",
 "Error configuring Dropbox storage" => "Dropbox সংরক্ষণাগার নির্ধারণ করতে সমস্যা ",
 "Grant access" => "অধিগমনের  অনুমতি প্রদান কর",
diff --git a/apps/files_external/l10n/bs.php b/apps/files_external/l10n/bs.php
new file mode 100644
index 0000000000..304b2225e7
--- /dev/null
+++ b/apps/files_external/l10n/bs.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Share" => "Podijeli"
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
index 8411d79306..e349dfe45e 100644
--- a/apps/files_external/l10n/ca.php
+++ b/apps/files_external/l10n/ca.php
@@ -1,5 +1,12 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Local",
+"Location" => "Ubicació",
+"Host" => "Equip remot",
+"Username" => "Nom d'usuari",
+"Password" => "Contrasenya",
+"Share" => "Comparteix",
+"URL" => "URL",
 "Access granted" => "S'ha concedit l'accés",
 "Error configuring Dropbox storage" => "Error en configurar l'emmagatzemament Dropbox",
 "Grant access" => "Concedeix accés",
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index 90d64529b1..2d1116ed0f 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -1,5 +1,33 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Místní",
+"Location" => "Umístění",
+"Amazon S3" => "Amazon S3",
+"Key" => "Klíč",
+"Secret" => "Tajemství",
+"Access Key" => "Přístupový klíč",
+"Secret Key" => "Tajný klíč",
+"Hostname (optional)" => "Hostname (nepovinný)",
+"Port (optional)" => "Port (nepovinný)",
+"Region (optional)" => "Region (nepovinný)",
+"Enable SSL" => "Povolit SSL",
+"App key" => "Klíč aplikace",
+"App secret" => "Tajemství aplikace",
+"Host" => "Počítač",
+"Username" => "Uživatelské jméno",
+"Password" => "Heslo",
+"Root" => "Root",
+"Secure ftps://" => "Zabezpečené ftps://",
+"Username (required)" => "Uživatelské jméno (nutné)",
+"Region (optional for OpenStack Object Storage)" => "Region (nepovinný pro OpenStack Object Storage)",
+"Password (required for OpenStack Object Storage)" => "Heslo (vyžadováno pro OpenStack Object Storage)",
+"Timeout of HTTP requests in seconds (optional)" => "Vypršení HTTP požadavků v sekundách (nepovinné)",
+"Share" => "Sdílet",
+"SMB / CIFS using OC login" => "SMB / CIFS za použití OC loginu",
+"Username as share" => "Uživatelské jméno jako sdílený adresář",
+"URL" => "URL",
+"Secure https://" => "Zabezpečené https://",
+"Remote subfolder" => "Vzdálený podadresář",
 "Access granted" => "Přístup povolen",
 "Error configuring Dropbox storage" => "Chyba při nastavení úložiště Dropbox",
 "Grant access" => "Povolit přístup",
@@ -18,7 +46,7 @@ $TRANSLATIONS = array(
 "Options" => "Možnosti",
 "Available for" => "Dostupné pro",
 "Add storage" => "Přidat úložiště",
-"No user or group" => "Žádný uživatel nebo skupina.",
+"No user or group" => "Žádný uživatel nebo skupina",
 "All Users" => "Všichni uživatelé",
 "Groups" => "Skupiny",
 "Users" => "Uživatelé",
diff --git a/apps/files_external/l10n/cy_GB.php b/apps/files_external/l10n/cy_GB.php
index 33992789cb..39822fcd38 100644
--- a/apps/files_external/l10n/cy_GB.php
+++ b/apps/files_external/l10n/cy_GB.php
@@ -1,5 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Lleoliad",
+"Username" => "Enw defnyddiwr",
+"Password" => "Cyfrinair",
+"Share" => "Rhannu",
+"URL" => "URL",
 "Groups" => "Grwpiau",
 "Users" => "Defnyddwyr",
 "Delete" => "Dileu"
diff --git a/apps/files_external/l10n/da.php b/apps/files_external/l10n/da.php
index e0dea75303..2d235747ad 100644
--- a/apps/files_external/l10n/da.php
+++ b/apps/files_external/l10n/da.php
@@ -1,17 +1,38 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Lokal",
+"Location" => "Placering",
+"Amazon S3" => "Amazon S3",
+"Key" => "Nøgle",
+"Secret" => "Hemmelighed",
+"Secret Key" => "Hemmelig Nøgle ",
+"Host" => "Host",
+"Username" => "Brugernavn",
+"Password" => "Kodeord",
+"Root" => "Root",
+"Secure ftps://" => "Sikker ftps://",
+"Client ID" => "Klient ID",
+"Client secret" => "Klient hemmelighed",
+"OpenStack Object Storage" => "OpenStack Object Storage",
+"Share" => "Del",
+"URL" => "URL",
+"Secure https://" => "Sikker https://",
 "Access granted" => "Adgang godkendt",
 "Error configuring Dropbox storage" => "Fejl ved konfiguration af Dropbox plads",
 "Grant access" => "Godkend adgang",
 "Please provide a valid Dropbox app key and secret." => "Angiv venligst en valid Dropbox app nøgle og hemmelighed",
 "Error configuring Google Drive storage" => "Fejl ved konfiguration af Google Drive plads",
 "Saved" => "Gemt",
+"<b>Note:</b> " => "<b>Note:</b> ",
+" and " => "og",
 "External Storage" => "Ekstern opbevaring",
 "Folder name" => "Mappenavn",
 "External storage" => "Eksternt lager",
 "Configuration" => "Opsætning",
 "Options" => "Valgmuligheder",
+"Available for" => "Tilgængelig for",
 "Add storage" => "Tilføj lager",
+"No user or group" => "Ingen bruger eller gruppe",
 "All Users" => "Alle brugere",
 "Groups" => "Grupper",
 "Users" => "Brugere",
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
index 25c7ffb3af..03f6f05abb 100644
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@@ -1,5 +1,44 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Lokal",
+"Location" => "Ort",
+"Amazon S3" => "Amazon S3",
+"Key" => "Schlüssel",
+"Secret" => "Geheime Zeichenkette",
+"Bucket" => "Bucket",
+"Amazon S3 and compliant" => "Amazon S3 und Kompatible",
+"Access Key" => "Zugriffsschlüssel",
+"Secret Key" => "Sicherheitssschlüssel",
+"Hostname (optional)" => "Host-Name (Optional)",
+"Port (optional)" => "Port (Optional)",
+"Region (optional)" => "Region (Optional)",
+"Enable SSL" => "SSL aktivieren",
+"Enable Path Style" => "Pfad-Stil aktivieren",
+"App key" => "App-Schlüssel",
+"App secret" => "Geheime Zeichenkette der App",
+"Host" => "Host",
+"Username" => "Benutzername",
+"Password" => "Passwort",
+"Root" => "Root",
+"Secure ftps://" => "Sicherer FTPS://",
+"Client ID" => "Client-ID",
+"Client secret" => "Geheime Zeichenkette des Client",
+"OpenStack Object Storage" => "Openstack-Objektspeicher",
+"Username (required)" => "Benutzername (Erforderlich)",
+"Bucket (required)" => "Bucket (Erforderlich)",
+"Region (optional for OpenStack Object Storage)" => "Region (Optional für Openstack-Objektspeicher)",
+"API Key (required for Rackspace Cloud Files)" => "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
+"Tenantname (required for OpenStack Object Storage)" => "Mietername (Erforderlich für Openstack-Objektspeicher)",
+"Password (required for OpenStack Object Storage)" => "Passwort (Erforderlich für Openstack-Objektspeicher)",
+"Service Name (required for OpenStack Object Storage)" => "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
+"Timeout of HTTP requests in seconds (optional)" => "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)",
+"Share" => "Teilen",
+"SMB / CIFS using OC login" => "´",
+"Username as share" => "Benutzername als Freigabe",
+"URL" => "URL",
+"Secure https://" => "Sicherer HTTPS://",
+"Remote subfolder" => "Remote-Unterordner:",
 "Access granted" => "Zugriff gestattet",
 "Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
 "Grant access" => "Zugriff gestatten",
diff --git a/apps/files_external/l10n/de_AT.php b/apps/files_external/l10n/de_AT.php
index afa3eff001..21004505e5 100644
--- a/apps/files_external/l10n/de_AT.php
+++ b/apps/files_external/l10n/de_AT.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Ort",
+"Password" => "Passwort",
+"Share" => "Freigeben",
 "Delete" => "Löschen"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/de_CH.php b/apps/files_external/l10n/de_CH.php
index 554fca8de5..4e0ac1f3a0 100644
--- a/apps/files_external/l10n/de_CH.php
+++ b/apps/files_external/l10n/de_CH.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Ort",
+"Host" => "Host",
+"Username" => "Benutzername",
+"Password" => "Passwort",
+"Share" => "Freigeben",
+"URL" => "URL",
 "Access granted" => "Zugriff gestattet",
 "Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
 "Grant access" => "Zugriff gestatten",
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
index 186aa5a299..286250f868 100644
--- a/apps/files_external/l10n/de_DE.php
+++ b/apps/files_external/l10n/de_DE.php
@@ -1,5 +1,44 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Lokal",
+"Location" => "Ort",
+"Amazon S3" => "Amazon S3",
+"Key" => "Schlüssel",
+"Secret" => "Geheime Zeichenkette",
+"Bucket" => "Bucket",
+"Amazon S3 and compliant" => "Amazon S3 und Kompatible",
+"Access Key" => "Zugriffsschlüssel",
+"Secret Key" => "Sicherheitsschlüssel",
+"Hostname (optional)" => "Host-Name (Optional)",
+"Port (optional)" => "Port (Optional)",
+"Region (optional)" => "Region (Optional)",
+"Enable SSL" => "SSL aktivieren",
+"Enable Path Style" => "Pfad-Stil aktivieren",
+"App key" => "App-Schlüssel",
+"App secret" => "Geheime Zeichenkette der App",
+"Host" => "Host",
+"Username" => "Benutzername",
+"Password" => "Passwort",
+"Root" => "Root",
+"Secure ftps://" => "Sicherer FTPS://",
+"Client ID" => "Client-ID",
+"Client secret" => "Geheime Zeichenkette des Client",
+"OpenStack Object Storage" => "Openstack-Objektspeicher",
+"Username (required)" => "Benutzername (Erforderlich)",
+"Bucket (required)" => "Bucket (Erforderlich)",
+"Region (optional for OpenStack Object Storage)" => "Region (Optional für Openstack-Objektspeicher)",
+"API Key (required for Rackspace Cloud Files)" => "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
+"Tenantname (required for OpenStack Object Storage)" => "Mietername (Erforderlich für Openstack-Objektspeicher)",
+"Password (required for OpenStack Object Storage)" => "Passwort (Erforderlich für Openstack-Objektspeicher)",
+"Service Name (required for OpenStack Object Storage)" => "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
+"Timeout of HTTP requests in seconds (optional)" => "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)",
+"Share" => "Teilen",
+"SMB / CIFS using OC login" => "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)",
+"Username as share" => "Benutzername als Freigabe",
+"URL" => "URL",
+"Secure https://" => "Sicherer HTTPS://",
+"Remote subfolder" => "Remote-Unterordner:",
 "Access granted" => "Zugriff gestattet",
 "Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
 "Grant access" => "Zugriff gestatten",
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index 16b837e24c..09d39a9e3c 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -1,17 +1,56 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Τοπικός",
+"Location" => "Τοποθεσία",
+"Key" => "Κλειδί",
+"Secret" => "Μυστικό",
+"Access Key" => "Κλειδί πρόσβασης",
+"Secret Key" => "Μυστικό κλειδί",
+"Hostname (optional)" => "Όνομα μηχανήματος (προαιρετικά)",
+"Port (optional)" => "Πόρτα (προαιρετικά)",
+"Region (optional)" => "Περιοχή (προαιρετικά)",
+"Enable SSL" => "Ενεργοποίηση SSL",
+"Enable Path Style" => "Ενεργοποίηση μορφής διαδρομής",
+"App key" => "Κλειδί εφαρμογής",
+"Host" => "Διακομιστής",
+"Username" => "Όνομα χρήστη",
+"Password" => "Κωδικός πρόσβασης",
+"Root" => "Root",
+"Secure ftps://" => "Ασφαλής ftps://",
+"Client ID" => "ID πελάτη",
+"Client secret" => "Μυστικό πελάτη",
+"OpenStack Object Storage" => "Αποθήκη αντικειμένων OpenStack",
+"Username (required)" => "Όνομα χρήστη (απαιτείται)",
+"Region (optional for OpenStack Object Storage)" => "Περιοχή (προαιρετικά για την αποθήκευση αντικειμένων OpenStack)",
+"API Key (required for Rackspace Cloud Files)" => "Κλειδί API (απαιτείται για αρχεία Rackspace Cloud)",
+"Password (required for OpenStack Object Storage)" => "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
+"Service Name (required for OpenStack Object Storage)" => "Όνομα υπηρεσίας (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "Διεύθυνση URL της ταυτότητας τελικού σημείου (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
+"Timeout of HTTP requests in seconds (optional)" => "Χρονικό όριο των αιτήσεων HTTP σε δευτερόλεπτα (προαιρετικά)",
+"Share" => "Διαμοιράστε",
+"SMB / CIFS using OC login" => "SMB / CIFS χρησιμοποιώντας λογαριασμό OC",
+"URL" => "URL",
+"Secure https://" => "Ασφαλής σύνδεση https://",
+"Remote subfolder" => "Απομακρυσμένος υποφάκελος",
 "Access granted" => "Προσβαση παρασχέθηκε",
 "Error configuring Dropbox storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ",
 "Grant access" => "Παροχή πρόσβασης",
 "Please provide a valid Dropbox app key and secret." => "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό.",
 "Error configuring Google Drive storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ",
 "Saved" => "Αποθηκεύτηκαν",
+"<b>Note:</b> " => "<b>Σημείωση:</b> ",
+" 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>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
+"<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>Σημείωση:</b> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Σημείωση:</b> Η επέκταση \"%s\" δεν είναι εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
 "External Storage" => "Εξωτερικό Αποθηκευτικό Μέσο",
 "Folder name" => "Όνομα φακέλου",
 "External storage" => "Εξωτερική αποθήκευση",
 "Configuration" => "Ρυθμίσεις",
 "Options" => "Επιλογές",
+"Available for" => "Διαθέσιμο για",
 "Add storage" => "Προσθηκη αποθηκευσης",
+"No user or group" => "Μη διαθέσιμος χρήστης ή ομάδα",
 "All Users" => "Όλοι οι Χρήστες",
 "Groups" => "Ομάδες",
 "Users" => "Χρήστες",
diff --git a/apps/files_external/l10n/en@pirate.php b/apps/files_external/l10n/en@pirate.php
new file mode 100644
index 0000000000..ab628e1717
--- /dev/null
+++ b/apps/files_external/l10n/en@pirate.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Password" => "Secret Code"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/en_GB.php b/apps/files_external/l10n/en_GB.php
index 4bd3f9daf2..d4229c607e 100644
--- a/apps/files_external/l10n/en_GB.php
+++ b/apps/files_external/l10n/en_GB.php
@@ -1,5 +1,44 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Local",
+"Location" => "Location",
+"Amazon S3" => "Amazon S3",
+"Key" => "Key",
+"Secret" => "Secret",
+"Bucket" => "Bucket",
+"Amazon S3 and compliant" => "Amazon S3 and compliant",
+"Access Key" => "Access Key",
+"Secret Key" => "Secret Key",
+"Hostname (optional)" => "Hostname (optional)",
+"Port (optional)" => "Port (optional)",
+"Region (optional)" => "Region (optional)",
+"Enable SSL" => "Enable SSL",
+"Enable Path Style" => "Enable Path Style",
+"App key" => "App key",
+"App secret" => "App secret",
+"Host" => "Host",
+"Username" => "Username",
+"Password" => "Password",
+"Root" => "Root",
+"Secure ftps://" => "Secure ftps://",
+"Client ID" => "Client ID",
+"Client secret" => "Client secret",
+"OpenStack Object Storage" => "OpenStack Object Storage",
+"Username (required)" => "Username (required)",
+"Bucket (required)" => "Bucket (required)",
+"Region (optional for OpenStack Object Storage)" => "Region (optional for OpenStack Object Storage)",
+"API Key (required for Rackspace Cloud Files)" => "API Key (required for Rackspace Cloud Files)",
+"Tenantname (required for OpenStack Object Storage)" => "Tenantname (required for OpenStack Object Storage)",
+"Password (required for OpenStack Object Storage)" => "Password (required for OpenStack Object Storage)",
+"Service Name (required for OpenStack Object Storage)" => "Service Name (required for OpenStack Object Storage)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "URL of identity endpoint (required for OpenStack Object Storage)",
+"Timeout of HTTP requests in seconds (optional)" => "Timeout of HTTP requests in seconds (optional)",
+"Share" => "Share",
+"SMB / CIFS using OC login" => "SMB / CIFS using OC login",
+"Username as share" => "Username as share",
+"URL" => "URL",
+"Secure https://" => "Secure https://",
+"Remote subfolder" => "Remote subfolder",
 "Access granted" => "Access granted",
 "Error configuring Dropbox storage" => "Error configuring Dropbox storage",
 "Grant access" => "Grant access",
diff --git a/apps/files_external/l10n/eo.php b/apps/files_external/l10n/eo.php
index 5312872c07..d3ca5a5add 100644
--- a/apps/files_external/l10n/eo.php
+++ b/apps/files_external/l10n/eo.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Loko",
+"Host" => "Gastigo",
+"Username" => "Uzantonomo",
+"Password" => "Pasvorto",
+"Share" => "Kunhavigi",
+"URL" => "URL",
 "Access granted" => "Alirpermeso donita",
 "Error configuring Dropbox storage" => "Eraro dum agordado de la memorservo Dropbox",
 "Grant access" => "Doni alirpermeson",
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
index bfe542c6e7..bbbe0a8c61 100644
--- a/apps/files_external/l10n/es.php
+++ b/apps/files_external/l10n/es.php
@@ -1,5 +1,44 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Local",
+"Location" => "Ubicación",
+"Amazon S3" => "Amazon S3",
+"Key" => "Clave",
+"Secret" => "Secreto",
+"Bucket" => "Depósito",
+"Amazon S3 and compliant" => "Amazon S3 y compatibilidad",
+"Access Key" => "Clave de Acceso",
+"Secret Key" => "Clave Secreta",
+"Hostname (optional)" => "Nombre de Equipo (opcional)",
+"Port (optional)" => "Puerto (opcional)",
+"Region (optional)" => "Región (opcional)",
+"Enable SSL" => "Habilitar SSL",
+"Enable Path Style" => "Habilitar Estilo de Ruta",
+"App key" => "App principal",
+"App secret" => "App secreta",
+"Host" => "Servidor",
+"Username" => "Nombre de usuario",
+"Password" => "Contraseña",
+"Root" => "Raíz",
+"Secure ftps://" => "Secure ftps://",
+"Client ID" => "ID de Cliente",
+"Client secret" => "Cliente secreto",
+"OpenStack Object Storage" => "OpenStack Object Storage",
+"Username (required)" => "Nombre de Usuario (requerido)",
+"Bucket (required)" => "Depósito (requerido)",
+"Region (optional for OpenStack Object Storage)" => "Región (opcional para OpenStack Object Storage)",
+"API Key (required for Rackspace Cloud Files)" => "Clave API (requerida para Rackspace Cloud Files)",
+"Tenantname (required for OpenStack Object Storage)" => "Nombre de Inquilino (requerido para OpenStack Object Storage)",
+"Password (required for OpenStack Object Storage)" => "Contraseña (requerida para OpenStack Object Storage)",
+"Service Name (required for OpenStack Object Storage)" => "Nombre de Servicio (requerido para OpenStack Object Storage)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "URL de identidad de punto final (requerido para OpenStack Object Storage)",
+"Timeout of HTTP requests in seconds (optional)" => "Tiempo de espera de peticiones HTTP en segundos (opcional)",
+"Share" => "Compartir",
+"SMB / CIFS using OC login" => "SMB / CIFS usando acceso OC",
+"Username as share" => "Nombre de Usuario como compartir",
+"URL" => "URL",
+"Secure https://" => "Secure https://",
+"Remote subfolder" => "Subcarpeta remota",
 "Access granted" => "Acceso concedido",
 "Error configuring Dropbox storage" => "Error configurando el almacenamiento de Dropbox",
 "Grant access" => "Conceder acceso",
diff --git a/apps/files_external/l10n/es_AR.php b/apps/files_external/l10n/es_AR.php
index 9bcff39f01..dfb53d9a78 100644
--- a/apps/files_external/l10n/es_AR.php
+++ b/apps/files_external/l10n/es_AR.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Ubicación",
+"Host" => "Servidor",
+"Username" => "Nombre de usuario",
+"Password" => "Contraseña",
+"Share" => "Compartir",
+"URL" => "URL",
 "Access granted" => "Acceso permitido",
 "Error configuring Dropbox storage" => "Error al configurar el almacenamiento de Dropbox",
 "Grant access" => "Permitir acceso",
diff --git a/apps/files_external/l10n/es_CL.php b/apps/files_external/l10n/es_CL.php
index f52482cad4..2bc6da9a59 100644
--- a/apps/files_external/l10n/es_CL.php
+++ b/apps/files_external/l10n/es_CL.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Username" => "Usuario",
+"Password" => "Clave",
+"Share" => "Compartir",
 "Folder name" => "Nombre del directorio"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/es_MX.php b/apps/files_external/l10n/es_MX.php
index dc0aef45c4..7e28798f58 100644
--- a/apps/files_external/l10n/es_MX.php
+++ b/apps/files_external/l10n/es_MX.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Ubicación",
+"Host" => "Servidor",
+"Username" => "Nombre de usuario",
+"Password" => "Contraseña",
+"Share" => "Compartir",
+"URL" => "URL",
 "Access granted" => "Acceso concedido",
 "Error configuring Dropbox storage" => "Error configurando el almacenamiento de Dropbox",
 "Grant access" => "Conceder acceso",
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
index 4da749b155..7344441197 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -1,5 +1,12 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Kohalik",
+"Location" => "Asukoht",
+"Host" => "Host",
+"Username" => "Kasutajanimi",
+"Password" => "Parool",
+"Share" => "Jaga",
+"URL" => "URL",
 "Access granted" => "Ligipääs on antud",
 "Error configuring Dropbox storage" => "Viga Dropboxi salvestusruumi seadistamisel",
 "Grant access" => "Anna ligipääs",
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
index c2111a1f73..ef29ba0484 100644
--- a/apps/files_external/l10n/eu.php
+++ b/apps/files_external/l10n/eu.php
@@ -1,21 +1,36 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Bertakoa",
+"Location" => "Kokapena",
+"Amazon S3" => "Amazon S3",
+"Port (optional)" => "Portua (hautazkoa)",
+"Enable SSL" => "Gaitu SSL",
+"Host" => "Hostalaria",
+"Username" => "Erabiltzaile izena",
+"Password" => "Pasahitza",
+"Share" => "Partekatu",
+"URL" => "URL",
 "Access granted" => "Sarrera baimendua",
 "Error configuring Dropbox storage" => "Errore bat egon da Dropbox biltegiratzea konfiguratzean",
 "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",
+"Saved" => "Gordeta",
+"<b>Note:</b> " => "<b>Oharra:</b>",
+" and " => "eta",
 "External Storage" => "Kanpoko Biltegiratzea",
 "Folder name" => "Karpetaren izena",
 "External storage" => "Kanpoko biltegiratzea",
 "Configuration" => "Konfigurazioa",
 "Options" => "Aukerak",
 "Add storage" => "Gehitu biltegiratzea",
+"No user or group" => "Talde edo erabiltzailerik ez",
 "All Users" => "Erabiltzaile guztiak",
 "Groups" => "Taldeak",
 "Users" => "Erabiltzaileak",
 "Delete" => "Ezabatu",
 "Enable User External Storage" => "Gaitu erabiltzaileentzako Kanpo Biltegiratzea",
+"Allow users to mount the following external storage" => "Baimendu erabiltzaileak hurrengo kanpo biltegiratzeak muntatzen",
 "SSL root certificates" => "SSL erro ziurtagiriak",
 "Import Root Certificate" => "Inportatu Erro Ziurtagiria"
 );
diff --git a/apps/files_external/l10n/eu_ES.php b/apps/files_external/l10n/eu_ES.php
index 8612c8609b..9b95b9d01a 100644
--- a/apps/files_external/l10n/eu_ES.php
+++ b/apps/files_external/l10n/eu_ES.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "kokapena",
 "Delete" => "Ezabatu"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/fa.php b/apps/files_external/l10n/fa.php
index 74472c54bf..674a728733 100644
--- a/apps/files_external/l10n/fa.php
+++ b/apps/files_external/l10n/fa.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "محل",
+"Host" => "میزبانی",
+"Username" => "نام کاربری",
+"Password" => "گذرواژه",
+"Share" => "اشتراک‌گذاری",
+"URL" => "آدرس",
 "Access granted" => "مجوز دسترسی صادر شد",
 "Error configuring Dropbox storage" => "خطا به هنگام تنظیم فضای دراپ باکس",
 "Grant access" => " مجوز اعطا دسترسی",
diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php
index 677425d8a6..aa7fb394d4 100644
--- a/apps/files_external/l10n/fi_FI.php
+++ b/apps/files_external/l10n/fi_FI.php
@@ -1,5 +1,18 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Paikallinen",
+"Location" => "Sijainti",
+"Amazon S3" => "Amazon S3",
+"Port (optional)" => "Portti (valinnainen)",
+"Region (optional)" => "Alue (valinnainen)",
+"Enable SSL" => "Käytä SSL:ää",
+"Host" => "Isäntä",
+"Username" => "Käyttäjätunnus",
+"Password" => "Salasana",
+"Username (required)" => "Käyttäjätunnus (vaaditaan)",
+"Share" => "Jaa",
+"URL" => "Verkko-osoite",
+"Secure https://" => "Salattu https://",
 "Access granted" => "Pääsy sallittu",
 "Error configuring Dropbox storage" => "Virhe Dropbox levyn asetuksia tehtäessä",
 "Grant access" => "Salli pääsy",
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
index 8ff1969718..df2f63ec2e 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -1,5 +1,26 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Local",
+"Location" => "Emplacement",
+"Amazon S3" => "Amazon S3",
+"Key" => "Clé",
+"Secret" => "Secret",
+"Access Key" => "Clé d'accès",
+"Secret Key" => "Clé secrète",
+"Hostname (optional)" => "Nom machine (optionnel)",
+"Port (optional)" => "Port (optionnel)",
+"Enable SSL" => "Activer SSL",
+"App key" => "Clé App",
+"Host" => "Hôte",
+"Username" => "Nom d'utilisateur",
+"Password" => "Mot de passe",
+"Root" => "Root",
+"Client ID" => "ID Client",
+"Username (required)" => "Nom d'utilisation (requis)",
+"API Key (required for Rackspace Cloud Files)" => "Clé API (requis pour Rackspace Cloud Files)",
+"Password (required for OpenStack Object Storage)" => "Mot de passe (requis pour OpenStack Object Storage)",
+"Share" => "Partager",
+"URL" => "URL",
 "Access granted" => "Accès autorisé",
 "Error configuring Dropbox storage" => "Erreur lors de la configuration du support de stockage Dropbox",
 "Grant access" => "Autoriser l'accès",
diff --git a/apps/files_external/l10n/gl.php b/apps/files_external/l10n/gl.php
index 5efa6ce602..248afb5f6a 100644
--- a/apps/files_external/l10n/gl.php
+++ b/apps/files_external/l10n/gl.php
@@ -1,5 +1,44 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Local",
+"Location" => "Localización",
+"Amazon S3" => "Amazon S3",
+"Key" => "Clave",
+"Secret" => "Secreto",
+"Bucket" => "Bucket",
+"Amazon S3 and compliant" => "Amazon S3 e compatíbeis",
+"Access Key" => "Clave de acceso",
+"Secret Key" => "Clave secreta",
+"Hostname (optional)" => "Nome de máquina (opcional)",
+"Port (optional)" => "Porto (opcional)",
+"Region (optional)" => "Rexión (opcional)",
+"Enable SSL" => "Activar SSL",
+"Enable Path Style" => "Activar o estilo de ruta",
+"App key" => "Clave da API",
+"App secret" => "Secreto do aplicativo",
+"Host" => "Servidor",
+"Username" => "Nome de usuario",
+"Password" => "Contrasinal",
+"Root" => "Root (raíz)",
+"Secure ftps://" => "ftps:// seguro",
+"Client ID" => "ID do cliente",
+"Client secret" => "Secreto do cliente",
+"OpenStack Object Storage" => "OpenStack Object Storage",
+"Username (required)" => "Nome de usuario (obrigatorio)",
+"Bucket (required)" => "Bucket (obrigatorio)",
+"Region (optional for OpenStack Object Storage)" => "Rexión (opcional para OpenStack Object Storage)",
+"API Key (required for Rackspace Cloud Files)" => "Clave da API (obrigatoria para Rackspace Cloud Files)",
+"Tenantname (required for OpenStack Object Storage)" => "Nome do inquilino (obrigatorio para OpenStack Object Storage)",
+"Password (required for OpenStack Object Storage)" => "Contrasinal (obrigatorio para OpenStack Object Storage)",
+"Service Name (required for OpenStack Object Storage)" => "Nome do servizo (obrigatorio para OpenStack Object Storage)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "URL do punto final da identidade (obrigatorio para OpenStack Object Storage)",
+"Timeout of HTTP requests in seconds (optional)" => "Tempo de espera de peticións HTTP en segundos (opcional)",
+"Share" => "Compartir",
+"SMB / CIFS using OC login" => "SMB / CIFS usando acceso OC",
+"Username as share" => "Nome de usuario como compartición",
+"URL" => "URL",
+"Secure https://" => "https:// seguro",
+"Remote subfolder" => "Subcartafol remoto",
 "Access granted" => "Concedeuse acceso",
 "Error configuring Dropbox storage" => "Produciuse un erro ao configurar o almacenamento en Dropbox",
 "Grant access" => "Permitir o acceso",
diff --git a/apps/files_external/l10n/he.php b/apps/files_external/l10n/he.php
index e433f4fc30..f55a35fcad 100644
--- a/apps/files_external/l10n/he.php
+++ b/apps/files_external/l10n/he.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "מיקום",
+"Host" => "מארח",
+"Username" => "שם משתמש",
+"Password" => "סיסמא",
+"Share" => "שיתוף",
+"URL" => "כתובת",
 "Access granted" => "הוענקה גישה",
 "Error configuring Dropbox storage" => "אירעה שגיאה בעת הגדרת אחסון ב־Dropbox",
 "Grant access" => "הענקת גישה",
diff --git a/apps/files_external/l10n/hi.php b/apps/files_external/l10n/hi.php
index 7df9657259..fdea5e7625 100644
--- a/apps/files_external/l10n/hi.php
+++ b/apps/files_external/l10n/hi.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Username" => "प्रयोक्ता का नाम",
+"Password" => "पासवर्ड",
+"Share" => "साझा करें",
 "Users" => "उपयोगकर्ता"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/hr.php b/apps/files_external/l10n/hr.php
index 91536e0b87..954a484b79 100644
--- a/apps/files_external/l10n/hr.php
+++ b/apps/files_external/l10n/hr.php
@@ -1,5 +1,9 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Lokacija",
+"Username" => "Korisničko ime",
+"Password" => "Lozinka",
+"Share" => "Podijeli",
 "Groups" => "Grupe",
 "Users" => "Korisnici",
 "Delete" => "Obriši"
diff --git a/apps/files_external/l10n/hu_HU.php b/apps/files_external/l10n/hu_HU.php
index 39d185d5f0..d9c570d68c 100644
--- a/apps/files_external/l10n/hu_HU.php
+++ b/apps/files_external/l10n/hu_HU.php
@@ -1,10 +1,17 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Hely",
+"Host" => "Kiszolgáló",
+"Username" => "Felhasználónév",
+"Password" => "Jelszó",
+"Share" => "Megosztás",
+"URL" => "URL",
 "Access granted" => "Érvényes hozzáférés",
 "Error configuring Dropbox storage" => "A Dropbox tárolót nem sikerült beállítani",
 "Grant access" => "Megadom a hozzáférést",
 "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",
+"Saved" => "Elmentve",
 "External Storage" => "Külső tárolási szolgáltatások becsatolása",
 "Folder name" => "Mappanév",
 "External storage" => "Külső tárolók",
diff --git a/apps/files_external/l10n/ia.php b/apps/files_external/l10n/ia.php
index 1873f4ad6f..978003e20c 100644
--- a/apps/files_external/l10n/ia.php
+++ b/apps/files_external/l10n/ia.php
@@ -1,5 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Loco",
+"Username" => "Nomine de usator",
+"Password" => "Contrasigno",
+"Share" => "Compartir",
+"URL" => "URL",
 "Folder name" => "Nomine de dossier",
 "Groups" => "Gruppos",
 "Users" => "Usatores",
diff --git a/apps/files_external/l10n/id.php b/apps/files_external/l10n/id.php
index 8ab5069539..a21ea7aef7 100644
--- a/apps/files_external/l10n/id.php
+++ b/apps/files_external/l10n/id.php
@@ -1,21 +1,44 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Lokal",
+"Location" => "lokasi",
+"Amazon S3" => "Amazon S3",
+"Hostname (optional)" => "Hostname (tambahan)",
+"Port (optional)" => "Port (tambahan)",
+"Region (optional)" => "Wilayah (tambahan)",
+"Enable SSL" => "Aktifkan SSL",
+"Host" => "Host",
+"Username" => "Nama Pengguna",
+"Password" => "Sandi",
+"Root" => "Root",
+"Username (required)" => "Nama pengguna (dibutuhkan)",
+"Share" => "Bagikan",
+"URL" => "tautan",
 "Access granted" => "Akses diberikan",
 "Error configuring Dropbox storage" => "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
 "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",
+"Saved" => "Disimpan",
+"<b>Note:</b> " => "<b>Catatan:</b> ",
+" and " => "dan",
+"<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>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.",
+"<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>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.",
 "External Storage" => "Penyimpanan Eksternal",
 "Folder name" => "Nama folder",
 "External storage" => "Penyimpanan eksternal",
 "Configuration" => "Konfigurasi",
 "Options" => "Opsi",
+"Available for" => "Tersedia untuk",
 "Add storage" => "Tambahkan penyimpanan",
+"No user or group" => "Tidak ada pengguna dan grup",
 "All Users" => "Semua Pengguna",
 "Groups" => "Grup",
 "Users" => "Pengguna",
 "Delete" => "Hapus",
 "Enable User External Storage" => "Aktifkan Penyimpanan Eksternal Pengguna",
+"Allow users to mount the following external storage" => "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut",
 "SSL root certificates" => "Sertifikat root SSL",
 "Import Root Certificate" => "Impor Sertifikat Root"
 );
diff --git a/apps/files_external/l10n/is.php b/apps/files_external/l10n/is.php
index 21a215807a..daf9c4cb44 100644
--- a/apps/files_external/l10n/is.php
+++ b/apps/files_external/l10n/is.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Staðsetning",
+"Host" => "Netþjónn",
+"Username" => "Notendanafn",
+"Password" => "Lykilorð",
+"Share" => "Deila",
+"URL" => "URL",
 "Access granted" => "Aðgengi veitt",
 "Error configuring Dropbox storage" => "Villa við að setja upp Dropbox gagnasvæði",
 "Grant access" => "Veita aðgengi",
diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php
index f3a6f9af12..c6428a27ba 100644
--- a/apps/files_external/l10n/it.php
+++ b/apps/files_external/l10n/it.php
@@ -1,5 +1,44 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Locale",
+"Location" => "Posizione",
+"Amazon S3" => "Amazon S3",
+"Key" => "Chiave",
+"Secret" => "Segreto",
+"Bucket" => "Bucket",
+"Amazon S3 and compliant" => "Amazon S3 e conformi",
+"Access Key" => "Chiave di accesso",
+"Secret Key" => "Chiave segreta",
+"Hostname (optional)" => "Nome host (opzionale)",
+"Port (optional)" => "Porta (opzionale)",
+"Region (optional)" => "Regione (opzionale)",
+"Enable SSL" => "Abilita SSL",
+"Enable Path Style" => "Abilita stile percorsi",
+"App key" => "Chiave applicazione",
+"App secret" => "Segreto applicazione",
+"Host" => "Host",
+"Username" => "Nome utente",
+"Password" => "Password",
+"Root" => "Radice",
+"Secure ftps://" => "Sicuro ftps://",
+"Client ID" => "ID client",
+"Client secret" => "Segreto del client",
+"OpenStack Object Storage" => "OpenStack Object Storage",
+"Username (required)" => "Nome utente (richiesto)",
+"Bucket (required)" => "Bucket (richiesto)",
+"Region (optional for OpenStack Object Storage)" => "Regione (facoltativa per OpenStack Object Storage)",
+"API Key (required for Rackspace Cloud Files)" => "Chiave API (richiesta per Rackspace Cloud Files)",
+"Tenantname (required for OpenStack Object Storage)" => "Nome tenant (richiesto per OpenStack Object Storage)",
+"Password (required for OpenStack Object Storage)" => "Password (richiesta per OpenStack Object Storage)",
+"Service Name (required for OpenStack Object Storage)" => "Nome servizio (richiesta per OpenStack Object Storage)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "URL del servizio di identità (richiesto per OpenStack Object Storage)",
+"Timeout of HTTP requests in seconds (optional)" => "Tempo massimo in secondi delle richieste HTTP (opzionale)",
+"Share" => "Condividi",
+"SMB / CIFS using OC login" => "SMB / CIFS utilizzando le credenziali di OC",
+"Username as share" => "Nome utente come condivisione",
+"URL" => "URL",
+"Secure https://" => "Sicuro https://",
+"Remote subfolder" => "Sottocartella remota",
 "Access granted" => "Accesso consentito",
 "Error configuring Dropbox storage" => "Errore durante la configurazione dell'archivio Dropbox",
 "Grant access" => "Concedi l'accesso",
diff --git a/apps/files_external/l10n/ja.php b/apps/files_external/l10n/ja.php
index 52d66043e1..b70dd2a09a 100644
--- a/apps/files_external/l10n/ja.php
+++ b/apps/files_external/l10n/ja.php
@@ -1,16 +1,61 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "ローカル",
+"Location" => "位置",
+"Amazon S3" => "Amazon S3",
+"Key" => "キー",
+"Secret" => "シークレットキー",
+"Bucket" => "バケット名",
+"Amazon S3 and compliant" => "Amazon S3 と互換ストレージ",
+"Access Key" => "アクセスキー",
+"Secret Key" => "シークレットキー",
+"Hostname (optional)" => "ホスト名 (オプション)",
+"Port (optional)" => "ポート (オプション)",
+"Region (optional)" => "リージョン (オプション)",
+"Enable SSL" => "SSLを有効",
+"Enable Path Style" => "パス形式を有効",
+"App key" => "アプリキー",
+"App secret" => "アプリシークレット",
+"Host" => "ホスト",
+"Username" => "ユーザー名",
+"Password" => "パスワード",
+"Root" => "ルート",
+"Secure ftps://" => "Secure ftps://",
+"Client ID" => "クライアントID",
+"Client secret" => "クライアント秘密キー",
+"OpenStack Object Storage" => "OpenStack Object Storage",
+"Username (required)" => "ユーザー名 (必須)",
+"Bucket (required)" => "バケット (必須)",
+"Region (optional for OpenStack Object Storage)" => "リージョン (OpenStack Object Storage用のオプション)",
+"API Key (required for Rackspace Cloud Files)" => "APIキー (Rackspace Cloud Filesに必須)",
+"Tenantname (required for OpenStack Object Storage)" => "テナント名 (OpenStack Object Storage用に必要)",
+"Password (required for OpenStack Object Storage)" => "パスワード (OpenStack Object Storage用に必要)",
+"Service Name (required for OpenStack Object Storage)" => "サービス名 (OpenStack Object Storage用に必要)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "識別用エンドポイントURL (OpenStack Object Storage用に必要)",
+"Timeout of HTTP requests in seconds (optional)" => "HTTPリクエストのタイムアウト秒数 (オプション)",
+"Share" => "共有",
+"SMB / CIFS using OC login" => "owncloudログインで SMB/CIFSを使用",
+"Username as share" => "共有名",
+"URL" => "URL",
+"Secure https://" => "セキュア https://",
+"Remote subfolder" => "リモートサブフォルダ",
 "Access granted" => "アクセスは許可されました",
 "Error configuring Dropbox storage" => "Dropboxストレージの設定エラー",
 "Grant access" => "アクセスを許可",
 "Please provide a valid Dropbox app key and secret." => "有効なDropboxアプリのキーとパスワードを入力してください。",
 "Error configuring Google Drive storage" => "Googleドライブストレージの設定エラー",
 "Saved" => "保存されました",
+"<b>Note:</b> " => "<b>注意:</b> ",
+" 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>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
+"<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>注意:</b> PHPにFTPのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>注意:</b> \"%s\" がインストールされていません。%sをマウントできません。このシステムの管理者にインストールをお願いしてください。",
 "External Storage" => "外部ストレージ",
 "Folder name" => "フォルダー名",
 "External storage" => "外部ストレージ",
 "Configuration" => "設定",
 "Options" => "オプション",
+"Available for" => "以下が利用可能",
 "Add storage" => "ストレージを追加",
 "No user or group" => "ユーザーもしくはグループがありません",
 "All Users" => "すべてのユーザー",
diff --git a/apps/files_external/l10n/jv.php b/apps/files_external/l10n/jv.php
new file mode 100644
index 0000000000..acff46664c
--- /dev/null
+++ b/apps/files_external/l10n/jv.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Location" => "Papan panggonan"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ka_GE.php b/apps/files_external/l10n/ka_GE.php
index d68dae88c0..a87c8b4879 100644
--- a/apps/files_external/l10n/ka_GE.php
+++ b/apps/files_external/l10n/ka_GE.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "ადგილმდებარეობა",
+"Host" => "ჰოსტი",
+"Username" => "მომხმარებლის სახელი",
+"Password" => "პაროლი",
+"Share" => "გაზიარება",
+"URL" => "URL",
 "Access granted" => "დაშვება მინიჭებულია",
 "Error configuring Dropbox storage" => "შეცდომა Dropbox საცავის კონფიგურირების დროს",
 "Grant access" => "დაშვების მინიჭება",
diff --git a/apps/files_external/l10n/km.php b/apps/files_external/l10n/km.php
index 75879f2300..da17fac1bf 100644
--- a/apps/files_external/l10n/km.php
+++ b/apps/files_external/l10n/km.php
@@ -1,7 +1,22 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "ទីតាំង",
+"Host" => "ម៉ាស៊ីន​ផ្ទុក",
+"Username" => "ឈ្មោះ​អ្នកប្រើ",
+"Password" => "ពាក្យសម្ងាត់",
+"Share" => "ចែក​រំលែក",
+"URL" => "URL",
+"Access granted" => "បាន​ទទួល​សិទ្ធិ​ចូល",
+"Error configuring Dropbox storage" => "កំហុស​ការ​កំណត់​សណ្ឋាន​នៃ​ឃ្លាំងផ្ទុក Dropbox",
+"Grant access" => "ទទួល​សិទ្ធិ​ចូល",
+"Saved" => "បាន​រក្សាទុក",
+"External Storage" => "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
 "Folder name" => "ឈ្មោះ​ថត",
+"External storage" => "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
+"Configuration" => "ការ​កំណត់​សណ្ឋាន",
 "Options" => "ជម្រើស",
+"Add storage" => "បន្ថែម​ឃ្លាំងផ្ទុក",
+"All Users" => "អ្នក​ប្រើ​ទាំងអស់",
 "Groups" => "ក្រុ",
 "Users" => "អ្នកប្រើ",
 "Delete" => "លុប"
diff --git a/apps/files_external/l10n/ko.php b/apps/files_external/l10n/ko.php
index 371cba3e12..631f95bc7b 100644
--- a/apps/files_external/l10n/ko.php
+++ b/apps/files_external/l10n/ko.php
@@ -1,10 +1,18 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "장소",
+"Amazon S3" => "Amazon S3",
+"Host" => "호스트",
+"Username" => "사용자 이름",
+"Password" => "암호",
+"Share" => "공유",
+"URL" => "URL",
 "Access granted" => "접근 허가됨",
 "Error configuring Dropbox storage" => "Dropbox 저장소 설정 오류",
 "Grant access" => "접근 권한 부여",
 "Please provide a valid Dropbox app key and secret." => "올바른 Dropbox 앱 키와 암호를 입력하십시오.",
 "Error configuring Google Drive storage" => "Google 드라이브 저장소 설정 오류",
+"Saved" => "저장됨",
 "External Storage" => "외부 저장소",
 "Folder name" => "폴더 이름",
 "External storage" => "외부 저장소",
diff --git a/apps/files_external/l10n/ku_IQ.php b/apps/files_external/l10n/ku_IQ.php
index 39778bce07..3d5a3dd0d3 100644
--- a/apps/files_external/l10n/ku_IQ.php
+++ b/apps/files_external/l10n/ku_IQ.php
@@ -1,5 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "شوێن",
+"Username" => "ناوی به‌کارهێنه‌ر",
+"Password" => "وشەی تێپەربو",
+"Share" => "هاوبەشی کردن",
+"URL" => "ناونیشانی به‌سته‌ر",
 "Folder name" => "ناوی بوخچه",
 "Users" => "به‌كارهێنه‌ر"
 );
diff --git a/apps/files_external/l10n/lb.php b/apps/files_external/l10n/lb.php
index 13233bf362..233b3f8105 100644
--- a/apps/files_external/l10n/lb.php
+++ b/apps/files_external/l10n/lb.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Uert",
+"Host" => "Host",
+"Username" => "Benotzernumm",
+"Password" => "Passwuert",
+"Share" => "Deelen",
+"URL" => "URL",
 "Folder name" => "Dossiers Numm:",
 "Groups" => "Gruppen",
 "Users" => "Benotzer",
diff --git a/apps/files_external/l10n/lt_LT.php b/apps/files_external/l10n/lt_LT.php
index fdf1ee7013..908abcc748 100644
--- a/apps/files_external/l10n/lt_LT.php
+++ b/apps/files_external/l10n/lt_LT.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Vieta",
+"Host" => "Mazgas",
+"Username" => "Prisijungimo vardas",
+"Password" => "Slaptažodis",
+"Share" => "Dalintis",
+"URL" => "URL",
 "Access granted" => "Priėjimas suteiktas",
 "Error configuring Dropbox storage" => "Klaida nustatinėjant Dropbox talpyklą",
 "Grant access" => "Suteikti priėjimą",
diff --git a/apps/files_external/l10n/lv.php b/apps/files_external/l10n/lv.php
index e1037b5032..5234bda7dc 100644
--- a/apps/files_external/l10n/lv.php
+++ b/apps/files_external/l10n/lv.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Vieta",
+"Host" => "Resursdators",
+"Username" => "Lietotājvārds",
+"Password" => "Parole",
+"Share" => "Dalīties",
+"URL" => "URL",
 "Access granted" => "Piešķirta pieeja",
 "Error configuring Dropbox storage" => "Kļūda, konfigurējot Dropbox krātuvi",
 "Grant access" => "Piešķirt pieeju",
diff --git a/apps/files_external/l10n/mk.php b/apps/files_external/l10n/mk.php
index 507c0a7455..e1bf57d5b9 100644
--- a/apps/files_external/l10n/mk.php
+++ b/apps/files_external/l10n/mk.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Локација",
+"Host" => "Домаќин",
+"Username" => "Корисничко име",
+"Password" => "Лозинка",
+"Share" => "Сподели",
+"URL" => "Адреса",
 "Access granted" => "Пристапот е дозволен",
 "Error configuring Dropbox storage" => "Грешка при конфигурација на Dropbox",
 "Grant access" => "Дозволи пристап",
diff --git a/apps/files_external/l10n/ms_MY.php b/apps/files_external/l10n/ms_MY.php
index 4e33263a86..e19ec49978 100644
--- a/apps/files_external/l10n/ms_MY.php
+++ b/apps/files_external/l10n/ms_MY.php
@@ -1,5 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Lokasi",
+"Username" => "Nama pengguna",
+"Password" => "Kata laluan",
+"Share" => "Kongsi",
+"URL" => "URL",
 "Groups" => "Kumpulan",
 "Users" => "Pengguna",
 "Delete" => "Padam"
diff --git a/apps/files_external/l10n/my_MM.php b/apps/files_external/l10n/my_MM.php
index 1cbe5f0fe5..775fa4d988 100644
--- a/apps/files_external/l10n/my_MM.php
+++ b/apps/files_external/l10n/my_MM.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "တည်နေရာ",
+"Username" => "သုံးစွဲသူအမည်",
+"Password" => "စကားဝှက်",
 "Users" => "သုံးစွဲသူ"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php
index 95c9b47f41..7897f4b3f8 100644
--- a/apps/files_external/l10n/nb_NO.php
+++ b/apps/files_external/l10n/nb_NO.php
@@ -1,22 +1,37 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Lokal",
+"Location" => "Sted",
+"Amazon S3" => "Amazon S3",
+"Host" => "Tjener",
+"Username" => "Brukernavn",
+"Password" => "Passord",
+"Share" => "Del",
+"URL" => "URL",
 "Access granted" => "Tilgang innvilget",
 "Error configuring Dropbox storage" => "Feil ved konfigurering av Dropbox-lagring",
 "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",
 "Saved" => "Lagret",
+"<b>Note:</b> " => "<b>Notat:</b> ",
+" and " => "og",
+"<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>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Montering av %s er ikke mulig. Be systemadministratoren om å 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." => "<b>Merk:</b> FTP støtte i PHP er ikke slått på eller innstallert. Kan ikke montere %s. Ta kontakt med din systemadministrator for å installere det.",
 "External Storage" => "Ekstern lagring",
 "Folder name" => "Mappenavn",
 "External storage" => "Ekstern lagringsplass",
 "Configuration" => "Konfigurasjon",
 "Options" => "Innstillinger",
+"Available for" => "Tilgjengelig for",
 "Add storage" => "Legg til lagringsplass",
+"No user or group" => "Ingen bruker eller gruppe",
 "All Users" => "Alle brukere",
 "Groups" => "Grupper",
 "Users" => "Brukere",
 "Delete" => "Slett",
 "Enable User External Storage" => "Aktiver ekstern lagring for bruker",
+"Allow users to mount the following external storage" => "Tillat brukere å montere følgende eksterne lagring",
 "SSL root certificates" => "SSL root-sertifikater",
 "Import Root Certificate" => "Importer root-sertifikat"
 );
diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php
index c055be50f8..2bdc047e96 100644
--- a/apps/files_external/l10n/nl.php
+++ b/apps/files_external/l10n/nl.php
@@ -1,5 +1,44 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Lokaal",
+"Location" => "Locatie",
+"Amazon S3" => "Amazon S3",
+"Key" => "Sleutel",
+"Secret" => "Geheim",
+"Bucket" => "Bucket",
+"Amazon S3 and compliant" => "Amazon S3 en overeenkomstig",
+"Access Key" => "Access Key",
+"Secret Key" => "Secret Key",
+"Hostname (optional)" => "Hostname (optioneel)",
+"Port (optional)" => "Poort (optioneel)",
+"Region (optional)" => "Regio (optioneel)",
+"Enable SSL" => "Activeren SSL",
+"Enable Path Style" => "Activeren pad stijl",
+"App key" => "App key",
+"App secret" => "App secret",
+"Host" => "Host",
+"Username" => "Gebruikersnaam",
+"Password" => "Wachtwoord",
+"Root" => "Root",
+"Secure ftps://" => "Secure ftps://",
+"Client ID" => "Client ID",
+"Client secret" => "Client secret",
+"OpenStack Object Storage" => "OpenStack Object Storage",
+"Username (required)" => "Gebruikersnaam (verplicht)",
+"Bucket (required)" => "Bucket (verplicht)",
+"Region (optional for OpenStack Object Storage)" => "Regio (optioneel voor OpenStack Object Storage)",
+"API Key (required for Rackspace Cloud Files)" => "API Key (verplicht voor Rackspace Cloud Files)",
+"Tenantname (required for OpenStack Object Storage)" => "Tenantname (Verplicht voor OpenStack Object Storage)",
+"Password (required for OpenStack Object Storage)" => "Wachtwoord (verplicht voor OpenStack Object Storage)",
+"Service Name (required for OpenStack Object Storage)" => "Service Name (verplicht voor OpenStack Object Storage)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "URL van identity endpoint (verplicht voor OpenStack Object Storage)",
+"Timeout of HTTP requests in seconds (optional)" => "Time-out van HTTP aanvragen in seconden (optioneel)",
+"Share" => "Share",
+"SMB / CIFS using OC login" => "SMB / CIFS via OC inlog",
+"Username as share" => "Gebruikersnaam als share",
+"URL" => "URL",
+"Secure https://" => "Secure https://",
+"Remote subfolder" => "Externe submap",
 "Access granted" => "Toegang toegestaan",
 "Error configuring Dropbox storage" => "Fout tijdens het configureren van Dropbox opslag",
 "Grant access" => "Sta toegang toe",
diff --git a/apps/files_external/l10n/nn_NO.php b/apps/files_external/l10n/nn_NO.php
index 7bb38f14ce..0ee80369ee 100644
--- a/apps/files_external/l10n/nn_NO.php
+++ b/apps/files_external/l10n/nn_NO.php
@@ -1,5 +1,12 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Stad",
+"Host" => "Tenar",
+"Username" => "Brukarnamn",
+"Password" => "Passord",
+"Share" => "Del",
+"URL" => "Nettstad",
+"Folder name" => "Mappenamn",
 "Configuration" => "Innstillingar",
 "Groups" => "Grupper",
 "Users" => "Brukarar",
diff --git a/apps/files_external/l10n/oc.php b/apps/files_external/l10n/oc.php
index 99f2fd507d..bd5c98ca05 100644
--- a/apps/files_external/l10n/oc.php
+++ b/apps/files_external/l10n/oc.php
@@ -1,5 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Plaça",
+"Username" => "Non d'usancièr",
+"Password" => "Senhal",
+"Share" => "Parteja",
+"URL" => "URL",
 "Groups" => "Grops",
 "Users" => "Usancièrs",
 "Delete" => "Escafa"
diff --git a/apps/files_external/l10n/pa.php b/apps/files_external/l10n/pa.php
index d633784f5c..0bdcf0b7f6 100644
--- a/apps/files_external/l10n/pa.php
+++ b/apps/files_external/l10n/pa.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Username" => "ਯੂਜ਼ਰ-ਨਾਂ",
+"Password" => "ਪਾਸਵਰ",
+"Share" => "ਸਾਂਝਾ ਕਰੋ",
 "Groups" => "ਗਰੁੱਪ",
 "Delete" => "ਹਟਾਓ"
 );
diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php
index 246e12b6ac..74d9347b60 100644
--- a/apps/files_external/l10n/pl.php
+++ b/apps/files_external/l10n/pl.php
@@ -1,5 +1,44 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Lokalny",
+"Location" => "Lokalizacja",
+"Amazon S3" => "Amazon S3",
+"Key" => "Klucz",
+"Secret" => "Hasło",
+"Bucket" => "Kosz",
+"Amazon S3 and compliant" => "Amazon S3 i zgodne",
+"Access Key" => "Klucz dostępu",
+"Secret Key" => "Klucz hasła",
+"Hostname (optional)" => "Nazwa hosta (opcjonalnie)",
+"Port (optional)" => "Port (opcjonalnie)",
+"Region (optional)" => "Region (opcjonalnie)",
+"Enable SSL" => "Włącz SSL",
+"Enable Path Style" => "Włącz styl ścieżki",
+"App key" => "Klucz aplikacji",
+"App secret" => "Hasło aplikacji",
+"Host" => "Host",
+"Username" => "Nazwa użytkownika",
+"Password" => "Hasło",
+"Root" => "Root",
+"Secure ftps://" => "Bezpieczny ftps://",
+"Client ID" => "ID klienta",
+"Client secret" => "Hasło klienta",
+"OpenStack Object Storage" => "Magazyn obiektów OpenStack",
+"Username (required)" => "Użytkownik (wymagany)",
+"Bucket (required)" => "Kosz (wymagany)",
+"Region (optional for OpenStack Object Storage)" => "Region (opcjonalny dla magazynu obiektów OpenStack)",
+"API Key (required for Rackspace Cloud Files)" => "Klucz API (wymagany dla plików Rackspace Cloud)",
+"Tenantname (required for OpenStack Object Storage)" => "Nazwa najemcy (wymagana dla magazynu obiektów OpenStack)",
+"Password (required for OpenStack Object Storage)" => "Hasło (wymagane dla magazynu obiektów OpenStack)",
+"Service Name (required for OpenStack Object Storage)" => "Nazwa usługi (wymagana dla magazynu obiektów OpenStack)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "URL lub zakończenie jednostki (wymagane dla magazynu obiektów OpenStack)",
+"Timeout of HTTP requests in seconds (optional)" => "Czas wygaśnięcia żądań HTTP w sekundach (opcjonalne)",
+"Share" => "Udostępnij",
+"SMB / CIFS using OC login" => "SMB / CIFS przy użyciu loginu OC",
+"Username as share" => "Użytkownik jako zasób",
+"URL" => "URL",
+"Secure https://" => "Bezpieczny https://",
+"Remote subfolder" => "Zdalny podfolder",
 "Access granted" => "Dostęp do",
 "Error configuring Dropbox storage" => "Wystąpił błąd podczas konfigurowania zasobu Dropbox",
 "Grant access" => "Udziel dostępu",
diff --git a/apps/files_external/l10n/pt_BR.php b/apps/files_external/l10n/pt_BR.php
index 9a5a39f235..b027a92e50 100644
--- a/apps/files_external/l10n/pt_BR.php
+++ b/apps/files_external/l10n/pt_BR.php
@@ -1,5 +1,44 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Local",
+"Location" => "Local",
+"Amazon S3" => "Amazon S3",
+"Key" => "Chave",
+"Secret" => "Secreta",
+"Bucket" => "Cesta",
+"Amazon S3 and compliant" => "Amazon S3 e compatível",
+"Access Key" => "Chave de Acesso",
+"Secret Key" => "Chave Secreta",
+"Hostname (optional)" => "Nome do Host (opcional)",
+"Port (optional)" => "Porta (opcional)",
+"Region (optional)" => "Região (opcional)",
+"Enable SSL" => "Habilitar SSL",
+"Enable Path Style" => "Habilitar Estilo do Caminho",
+"App key" => "Chave do Aplicativo",
+"App secret" => "Segredo da Aplicação",
+"Host" => "Servidor",
+"Username" => "Nome de Usuário",
+"Password" => "Senha",
+"Root" => "Raiz",
+"Secure ftps://" => "Seguro ftps://",
+"Client ID" => "ID do Cliente",
+"Client secret" => "Segredo do cliente",
+"OpenStack Object Storage" => "Armazenamento de Objetos OpenStack",
+"Username (required)" => "Nome do Usuário (requerido)",
+"Bucket (required)" => "Cesta (requerido)",
+"Region (optional for OpenStack Object Storage)" => "Região (opcional para armazenamento de objetos OpenStack)",
+"API Key (required for Rackspace Cloud Files)" => "Chave API (necessário para Rackspace Cloud File)",
+"Tenantname (required for OpenStack Object Storage)" => "Nome Tenant (necessário para armazenamento de objetos OpenStack)",
+"Password (required for OpenStack Object Storage)" => "Senha (necessário para armazenamento de objetos OpenStack)",
+"Service Name (required for OpenStack Object Storage)" => "Nome do Serviço (necessário para armazenamento de objetos OpenStack)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "Ponto final de identidade da URL (obrigatório para armazenamento de objetos OpenStack)",
+"Timeout of HTTP requests in seconds (optional)" => "Tempo limite de solicitações HTTP em segundos (opcional)",
+"Share" => "Compartilhar",
+"SMB / CIFS using OC login" => "SMB / CIFS usando OC logon",
+"Username as share" => "Nome de usuário como compartilhado",
+"URL" => "URL",
+"Secure https://" => "https:// segura",
+"Remote subfolder" => "Subpasta remota",
 "Access granted" => "Acesso concedido",
 "Error configuring Dropbox storage" => "Erro ao configurar armazenamento do Dropbox",
 "Grant access" => "Permitir acesso",
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index d0b70006ea..2daa72715b 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -1,17 +1,46 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Local",
+"Location" => "Local",
+"Amazon S3" => "Amazon S3",
+"Key" => "Chave",
+"Secret" => "Secreto",
+"Access Key" => "Chave de acesso",
+"Secret Key" => "Chave Secreta",
+"Port (optional)" => "Porta (opcional)",
+"Region (optional)" => "Região (opcional)",
+"Enable SSL" => "Activar SSL",
+"App key" => "Chave da aplicação",
+"App secret" => "Chave secreta da aplicação",
+"Host" => "Endereço",
+"Username" => "Nome de utilizador",
+"Password" => "Palavra-passe",
+"Root" => "Raiz",
+"Client ID" => "ID Cliente",
+"Client secret" => "Segredo do cliente",
+"Username (required)" => "Utilizador (requerido)",
+"Share" => "Partilhar",
+"URL" => "URL",
+"Remote subfolder" => "Sub-pasta remota ",
 "Access granted" => "Acesso autorizado",
 "Error configuring Dropbox storage" => "Erro ao configurar o armazenamento do Dropbox",
 "Grant access" => "Conceder acesso",
 "Please provide a valid Dropbox app key and secret." => "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas.",
 "Error configuring Google Drive storage" => "Erro ao configurar o armazenamento do Google Drive",
 "Saved" => "Guardado",
+"<b>Note:</b> " => "<b>Aviso:</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>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. 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." => "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O cliente\"%s\" não está instalado. Não é possível montar \"%s\" . Peça ao seu administrador para instalar.",
 "External Storage" => "Armazenamento Externo",
 "Folder name" => "Nome da pasta",
 "External storage" => "Armazenamento Externo",
 "Configuration" => "Configuração",
 "Options" => "Opções",
+"Available for" => "Disponível para ",
 "Add storage" => "Adicionar armazenamento",
+"No user or group" => "Sem utilizador nem grupo",
 "All Users" => "Todos os utilizadores",
 "Groups" => "Grupos",
 "Users" => "Utilizadores",
diff --git a/apps/files_external/l10n/ro.php b/apps/files_external/l10n/ro.php
index 3fc56c67d3..d5e1e90c54 100644
--- a/apps/files_external/l10n/ro.php
+++ b/apps/files_external/l10n/ro.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Locație",
+"Host" => "Gazdă",
+"Username" => "Nume utilizator",
+"Password" => "Parolă",
+"Share" => "Partajează",
+"URL" => "URL",
 "Access granted" => "Acces permis",
 "Error configuring Dropbox storage" => "Eroare la configurarea mediului de stocare Dropbox",
 "Grant access" => "Permite accesul",
diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php
index f282f3969e..6aded8e9a3 100644
--- a/apps/files_external/l10n/ru.php
+++ b/apps/files_external/l10n/ru.php
@@ -1,5 +1,12 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Локально",
+"Location" => "Местоположение",
+"Host" => "Сервер",
+"Username" => "Имя пользователя",
+"Password" => "Пароль",
+"Share" => "Открыть доступ",
+"URL" => "Ссылка",
 "Access granted" => "Доступ предоставлен",
 "Error configuring Dropbox storage" => "Ошибка при настройке хранилища Dropbox",
 "Grant access" => "Предоставление доступа",
diff --git a/apps/files_external/l10n/si_LK.php b/apps/files_external/l10n/si_LK.php
index a9f39a3bbc..960ededaa6 100644
--- a/apps/files_external/l10n/si_LK.php
+++ b/apps/files_external/l10n/si_LK.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "ස්ථානය",
+"Host" => "සත්කාරකය",
+"Username" => "පරිශීලක නම",
+"Password" => "මුර පදය",
+"Share" => "බෙදා හදා ගන්න",
+"URL" => "URL",
 "Access granted" => "පිවිසීමට හැක",
 "Error configuring Dropbox storage" => "Dropbox ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත",
 "Grant access" => "පිවිසුම ලබාදෙන්න",
diff --git a/apps/files_external/l10n/sk.php b/apps/files_external/l10n/sk.php
index 3129cf5c41..03dcc93e7c 100644
--- a/apps/files_external/l10n/sk.php
+++ b/apps/files_external/l10n/sk.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Poloha",
+"Share" => "Zdieľať",
 "Delete" => "Odstrániť"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
index 96f6241e5f..f576d92cda 100644
--- a/apps/files_external/l10n/sk_SK.php
+++ b/apps/files_external/l10n/sk_SK.php
@@ -1,5 +1,12 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Lokálny",
+"Location" => "Umiestnenie",
+"Host" => "Hostiteľ",
+"Username" => "Používateľské meno",
+"Password" => "Heslo",
+"Share" => "Zdieľať",
+"URL" => "URL",
 "Access granted" => "Prístup povolený",
 "Error configuring Dropbox storage" => "Chyba pri konfigurácii úložiska Dropbox",
 "Grant access" => "Povoliť prístup",
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index baab272d1d..c47e962b6e 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -1,5 +1,34 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Krajevno",
+"Location" => "Mesto",
+"Amazon S3" => "Amazon S3",
+"Key" => "Ključ",
+"Secret" => "Skrivni ključ",
+"Amazon S3 and compliant" => "Amazon S3 in podobno",
+"Access Key" => "Ključ za dostop",
+"Secret Key" => "Skrivni ključ",
+"Hostname (optional)" => "Ime gostitelja (izbirno)",
+"Port (optional)" => "Vrata (izbirno)",
+"Region (optional)" => "Območje (izbirno)",
+"Enable SSL" => "Omogoči SSL",
+"Enable Path Style" => "Omogoči slog poti",
+"App key" => "Programski ključ",
+"App secret" => "Skrivni programski ključ",
+"Host" => "Gostitelj",
+"Username" => "Uporabniško ime",
+"Password" => "Geslo",
+"Root" => "Koren",
+"Secure ftps://" => "Varni način ftps://",
+"Client ID" => "ID odjemalca",
+"Client secret" => "Skrivni ključ odjemalca",
+"Username (required)" => "Uporabniško ime (zahtevano)",
+"Share" => "Souporaba",
+"SMB / CIFS using OC login" => "SMB / CIFS z uporabo prijave OC",
+"Username as share" => "Uporabniško ime za souporabo",
+"URL" => "Naslov URL",
+"Secure https://" => "Varni način https://",
+"Remote subfolder" => "Oddaljena podrejena mapa",
 "Access granted" => "Dostop je odobren",
 "Error configuring Dropbox storage" => "Napaka nastavljanja shrambe Dropbox",
 "Grant access" => "Odobri dostop",
diff --git a/apps/files_external/l10n/sq.php b/apps/files_external/l10n/sq.php
index 328822dcde..1904514fdc 100644
--- a/apps/files_external/l10n/sq.php
+++ b/apps/files_external/l10n/sq.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Vendndodhja",
+"Host" => "Pritësi",
+"Username" => "Përdoruesi",
+"Password" => "fjalëkalim",
+"Share" => "Ndaj",
+"URL" => "URL-i",
 "Groups" => "Grupet",
 "Users" => "Përdoruesit",
 "Delete" => "Elimino"
diff --git a/apps/files_external/l10n/sr.php b/apps/files_external/l10n/sr.php
index c456daa004..bf150f5b5b 100644
--- a/apps/files_external/l10n/sr.php
+++ b/apps/files_external/l10n/sr.php
@@ -1,5 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Локација",
+"Host" => "Домаћин",
+"Username" => "Корисничко име",
+"Password" => "Лозинка",
+"Share" => "Дели",
 "Groups" => "Групе",
 "Users" => "Корисници",
 "Delete" => "Обриши"
diff --git a/apps/files_external/l10n/sr@latin.php b/apps/files_external/l10n/sr@latin.php
index a2489bbc64..2f17617c11 100644
--- a/apps/files_external/l10n/sr@latin.php
+++ b/apps/files_external/l10n/sr@latin.php
@@ -1,5 +1,9 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Lokacija",
+"Username" => "Korisničko ime",
+"Password" => "Lozinka",
+"Share" => "Podeli",
 "Groups" => "Grupe",
 "Users" => "Korisnici",
 "Delete" => "Obriši"
diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php
index 761e8f880c..a1c2a7cabe 100644
--- a/apps/files_external/l10n/sv.php
+++ b/apps/files_external/l10n/sv.php
@@ -1,5 +1,19 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Lokal",
+"Location" => "Plats",
+"Amazon S3" => "Amazon S3",
+"Key" => "Nyckel",
+"Secret" => "Hemlig",
+"Enable SSL" => "Aktivera SSL",
+"Host" => "Server",
+"Username" => "Användarnamn",
+"Password" => "Lösenord",
+"Root" => "Root",
+"Secure ftps://" => "Säker ftps://",
+"Share" => "Dela",
+"URL" => "URL",
+"Secure https://" => "Säker https://",
 "Access granted" => "Åtkomst beviljad",
 "Error configuring Dropbox storage" => "Fel vid konfigurering av Dropbox",
 "Grant access" => "Bevilja åtkomst",
diff --git a/apps/files_external/l10n/ta_LK.php b/apps/files_external/l10n/ta_LK.php
index fe5d2a8bc8..a94b7417ff 100644
--- a/apps/files_external/l10n/ta_LK.php
+++ b/apps/files_external/l10n/ta_LK.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "இடம்",
+"Host" => "ஓம்புனர்",
+"Username" => "பயனாளர் பெயர்",
+"Password" => "கடவுச்சொல்",
+"Share" => "பகிர்வு",
+"URL" => "URL",
 "Access granted" => "அனுமதி வழங்கப்பட்டது",
 "Error configuring Dropbox storage" => "Dropbox சேமிப்பை தகவமைப்பதில் வழு",
 "Grant access" => "அனுமதியை வழங்கல்",
diff --git a/apps/files_external/l10n/te.php b/apps/files_external/l10n/te.php
index 7f8d893d46..ee902788a3 100644
--- a/apps/files_external/l10n/te.php
+++ b/apps/files_external/l10n/te.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Username" => "వాడుకరి పేరు",
+"Password" => "సంకేతపదం",
 "Folder name" => "సంచయం పేరు",
 "Users" => "వాడుకరులు",
 "Delete" => "తొలగించు"
diff --git a/apps/files_external/l10n/th_TH.php b/apps/files_external/l10n/th_TH.php
index e3653eb41f..9f393a2546 100644
--- a/apps/files_external/l10n/th_TH.php
+++ b/apps/files_external/l10n/th_TH.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "ตำแหน่งที่อยู่",
+"Host" => "โฮสต์",
+"Username" => "ชื่อผู้ใช้งาน",
+"Password" => "รหัสผ่าน",
+"Share" => "แชร์",
+"URL" => "URL",
 "Access granted" => "การเข้าถึงได้รับอนุญาตแล้ว",
 "Error configuring Dropbox storage" => "เกิดข้อผิดพลาดในการกำหนดค่าพื้นที่จัดเก็บข้อมูล Dropbox",
 "Grant access" => "อนุญาตให้เข้าถึงได้",
diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php
index 3646a47605..5af8813e67 100644
--- a/apps/files_external/l10n/tr.php
+++ b/apps/files_external/l10n/tr.php
@@ -1,5 +1,44 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Yerel",
+"Location" => "Konum",
+"Amazon S3" => "Amazon S3",
+"Key" => "Anahtar",
+"Secret" => "Parola",
+"Bucket" => "Bucket",
+"Amazon S3 and compliant" => "Amazon S3 ve uyumlu olanlar",
+"Access Key" => "Erişim Anahtarı",
+"Secret Key" => "Gizli Anahtar",
+"Hostname (optional)" => "Makine Adı (isteğe bağlı)",
+"Port (optional)" => "Bağl. Nok. (isteğe bağlı)",
+"Region (optional)" => "Bölge (isteğe bağlı)",
+"Enable SSL" => "SSL'yi Etkinleştir",
+"Enable Path Style" => "Yol Biçemini Etkinleştir",
+"App key" => "Uyg. anahtarı",
+"App secret" => "Uyg. parolası",
+"Host" => "Sunucu",
+"Username" => "Kullanıcı Adı:",
+"Password" => "Parola:",
+"Root" => "Kök",
+"Secure ftps://" => "Güvenli ftps://",
+"Client ID" => "İstemci Kimliğ",
+"Client secret" => "İstemci parolası",
+"OpenStack Object Storage" => "OpenStack Nesne Depolama",
+"Username (required)" => "Kullanıcı adı (gerekli)",
+"Bucket (required)" => "Bucket (gerekli)",
+"Region (optional for OpenStack Object Storage)" => "Bölge (OpenStack Nesne Depolaması için isteğe bağlı)",
+"API Key (required for Rackspace Cloud Files)" => "API Anahtarı (Rackspace Bulut Dosyaları için gerekli)",
+"Tenantname (required for OpenStack Object Storage)" => "Kiracı Adı (OpenStack Nesne Depolaması için gerekli)",
+"Password (required for OpenStack Object Storage)" => "Parola (OpenStack Nesne Depolaması için gerekli)",
+"Service Name (required for OpenStack Object Storage)" => "Hizmet Adı (OpenStack Nesne Depolaması için gerekli)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "Kimlik uç nokta adresi (OpenStack Nesne Depolaması için gerekli)",
+"Timeout of HTTP requests in seconds (optional)" => "Saniye cinsinden HTTP istek zaman aşımı (isteğe bağlı)",
+"Share" => "Paylaş",
+"SMB / CIFS using OC login" => "OC oturumu kullanarak SMB / CIFS",
+"Username as share" => "Paylaşım olarak kullanıcı adı",
+"URL" => "URL",
+"Secure https://" => "Güvenli https://",
+"Remote subfolder" => "Uzak alt klasör",
 "Access granted" => "Giriş kabul edildi",
 "Error configuring Dropbox storage" => "Dropbox depo yapılandırma hatası",
 "Grant access" => "Erişim sağlandı",
diff --git a/apps/files_external/l10n/ug.php b/apps/files_external/l10n/ug.php
index ae20f7424d..701a5457ae 100644
--- a/apps/files_external/l10n/ug.php
+++ b/apps/files_external/l10n/ug.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "ئورنى",
+"Host" => "باش ئاپپارات",
+"Username" => "ئىشلەتكۈچى ئاتى",
+"Password" => "ئىم",
+"Share" => "ھەمبەھىر",
+"URL" => "URL",
 "Folder name" => "قىسقۇچ ئاتى",
 "External storage" => "سىرتقى ساقلىغۇچ",
 "Configuration" => "سەپلىمە",
diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php
index 533eba07eb..aea352a686 100644
--- a/apps/files_external/l10n/uk.php
+++ b/apps/files_external/l10n/uk.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Місце",
+"Host" => "Хост",
+"Username" => "Ім'я користувача",
+"Password" => "Пароль",
+"Share" => "Поділитися",
+"URL" => "URL",
 "Access granted" => "Доступ дозволено",
 "Error configuring Dropbox storage" => "Помилка при налаштуванні сховища Dropbox",
 "Grant access" => "Дозволити доступ",
diff --git a/apps/files_external/l10n/ur_PK.php b/apps/files_external/l10n/ur_PK.php
index 56df17991b..5d4695b511 100644
--- a/apps/files_external/l10n/ur_PK.php
+++ b/apps/files_external/l10n/ur_PK.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
-"Users" => "یوزرز"
+"Location" => "مقام",
+"Username" => "یوزر نیم",
+"Password" => "پاسورڈ",
+"Share" => "تقسیم",
+"URL" => "یو ار ایل",
+"Users" => "یوزرز",
+"Delete" => "حذف کریں"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/vi.php b/apps/files_external/l10n/vi.php
index 787fc82832..03d50bc143 100644
--- a/apps/files_external/l10n/vi.php
+++ b/apps/files_external/l10n/vi.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Location" => "Vị trí",
+"Host" => "Máy chủ",
+"Username" => "Tên đăng nhập",
+"Password" => "Mật khẩu",
+"Share" => "Chia sẻ",
+"URL" => "URL",
 "Access granted" => "Đã cấp quyền truy cập",
 "Error configuring Dropbox storage" => "Lỗi cấu hình lưu trữ Dropbox ",
 "Grant access" => "Cấp quyền truy cập",
diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php
index 40d5158bf5..95e9c0e643 100644
--- a/apps/files_external/l10n/zh_CN.php
+++ b/apps/files_external/l10n/zh_CN.php
@@ -1,21 +1,45 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "本地",
+"Location" => "地点",
+"Amazon S3" => "Amazon S3",
+"Access Key" => "访问密钥",
+"Hostname (optional)" => "域名 (可选)",
+"Port (optional)" => "端口 (可选)",
+"Region (optional)" => "区域 (optional)",
+"Enable SSL" => "启用 SSL",
+"Host" => "主机",
+"Username" => "用户名",
+"Password" => "密码",
+"Root" => "根路径",
+"Secure ftps://" => "安全 ftps://",
+"Share" => "共享",
+"SMB / CIFS using OC login" => "SMB / CIFS 使用 OC 登录信息",
+"URL" => "URL",
+"Secure https://" => "安全 https://",
+"Remote subfolder" => "远程子文件夹",
 "Access granted" => "权限已授予。",
 "Error configuring Dropbox storage" => "配置Dropbox存储时出错",
 "Grant access" => "授权",
 "Please provide a valid Dropbox app key and secret." => "请提供有效的Dropbox应用key和secret",
 "Error configuring Google Drive storage" => "配置Google Drive存储时出错",
+"Saved" => "已保存",
+"<b>Note:</b> " => "<b>注意：</b>",
+" and " => "和",
 "External Storage" => "外部存储",
 "Folder name" => "目录名称",
 "External storage" => "外部存储",
 "Configuration" => "配置",
 "Options" => "选项",
+"Available for" => "可用于",
 "Add storage" => "添加存储",
+"No user or group" => "无用户或组",
 "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/zh_HK.php b/apps/files_external/l10n/zh_HK.php
index 7a6c4765f9..5a15446948 100644
--- a/apps/files_external/l10n/zh_HK.php
+++ b/apps/files_external/l10n/zh_HK.php
@@ -1,5 +1,9 @@
 <?php
 $TRANSLATIONS = array(
+"Username" => "用戶名稱",
+"Password" => "密碼",
+"Share" => "分享",
+"URL" => "網址",
 "Folder name" => "資料夾名稱",
 "Groups" => "群組",
 "Users" => "用戶",
diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php
index 9a99a12aaa..154009f7a1 100644
--- a/apps/files_external/l10n/zh_TW.php
+++ b/apps/files_external/l10n/zh_TW.php
@@ -1,5 +1,12 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "本地",
+"Location" => "地點",
+"Host" => "主機",
+"Username" => "使用者名稱：",
+"Password" => "密碼",
+"Share" => "分享",
+"URL" => "URL",
 "Access granted" => "允許存取",
 "Error configuring Dropbox storage" => "設定 Dropbox 儲存時發生錯誤",
 "Grant access" => "允許存取",
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 2093fb7e58..7ff17f0e98 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -25,7 +25,7 @@
 namespace OC\Files\Storage;
 
 set_include_path(get_include_path() . PATH_SEPARATOR .
-        \OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
+	\OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
 require 'aws-autoloader.php';
 
 use Aws\S3\S3Client;
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 99eca2f38c..7a651239cb 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -132,7 +132,7 @@ class OC_Mount_Config {
 		}
 
 		// Load system mount points
-		$mountConfig = self::readData(false);
+		$mountConfig = self::readData();
 		if (isset($mountConfig[self::MOUNT_TYPE_GLOBAL])) {
 			foreach ($mountConfig[self::MOUNT_TYPE_GLOBAL] as $mountPoint => $options) {
 				$options['options'] = self::decryptPasswords($options['options']);
@@ -169,7 +169,7 @@ class OC_Mount_Config {
 		}
 
 		// Load personal mount points
-		$mountConfig = self::readData(true);
+		$mountConfig = self::readData($user);
 		if (isset($mountConfig[self::MOUNT_TYPE_USER][$user])) {
 			foreach ($mountConfig[self::MOUNT_TYPE_USER][$user] as $mountPoint => $options) {
 				$options['options'] = self::decryptPasswords($options['options']);
@@ -233,7 +233,7 @@ class OC_Mount_Config {
 	* @return array
 	*/
 	public static function getSystemMountPoints() {
-		$mountPoints = self::readData(false);
+		$mountPoints = self::readData();
 		$backends = self::getBackends();
 		$system = array();
 		if (isset($mountPoints[self::MOUNT_TYPE_GROUP])) {
@@ -306,7 +306,7 @@ class OC_Mount_Config {
 	* @return array
 	*/
 	public static function getPersonalMountPoints() {
-		$mountPoints = self::readData(true);
+		$mountPoints = self::readData(OCP\User::getUser());
 		$backEnds = self::getBackends();
 		$uid = OCP\User::getUser();
 		$personal = array();
@@ -359,10 +359,10 @@ class OC_Mount_Config {
 	* Add a mount point to the filesystem
 	* @param string $mountPoint Mount point
 	* @param string $class Backend class
-	* @param array Backend parameters for the class
+	* @param array $classOptions Backend parameters for the class
 	* @param string $mountType MOUNT_TYPE_GROUP | MOUNT_TYPE_USER
 	* @param string $applicable User or group to apply mount to
-	* @param bool Personal or system mount point i.e. is this being called from the personal or admin page
+	* @param bool $isPersonal Personal or system mount point i.e. is this being called from the personal or admin page
 	* @return boolean
 	*/
 	public static function addMountPoint($mountPoint,
@@ -400,28 +400,20 @@ class OC_Mount_Config {
 				'options' => self::encryptPasswords($classOptions))
 			)
 		);
-		$mountPoints = self::readData($isPersonal);
-		// Merge the new mount point into the current mount points
-		if (isset($mountPoints[$mountType])) {
-			if (isset($mountPoints[$mountType][$applicable])) {
-				$mountPoints[$mountType][$applicable]
-					= array_merge($mountPoints[$mountType][$applicable], $mount[$applicable]);
-			} else {
-				$mountPoints[$mountType] = array_merge($mountPoints[$mountType], $mount);
-			}
-		} else {
-			$mountPoints[$mountType] = $mount;
-		}
-		self::writeData($isPersonal, $mountPoints);
+
+		$mountPoints = self::readData($isPersonal ? OCP\User::getUser() : NULL);
+		$mountPoints = self::mergeMountPoints($mountPoints, $mount, $mountType);
+		self::writeData($isPersonal ? OCP\User::getUser() : NULL, $mountPoints);
+
 		return self::getBackendStatus($class, $classOptions, $isPersonal);
 	}
 
 	/**
 	*
-	* @param string Mount point
-	* @param string MOUNT_TYPE_GROUP | MOUNT_TYPE_USER
-	* @param string User or group to remove mount from
-	* @param bool Personal or system mount point
+	* @param string $mountPoint Mount point
+	* @param string $mountType MOUNT_TYPE_GROUP | MOUNT_TYPE_USER
+	* @param string $applicable User or group to remove mount from
+	* @param bool $isPersonal Personal or system mount point
 	* @return bool
 	*/
 	public static function removeMountPoint($mountPoint, $mountType, $applicable, $isPersonal = false) {
@@ -434,7 +426,7 @@ class OC_Mount_Config {
 		} else {
 			$mountPoint = '/$user/files/'.ltrim($mountPoint, '/');
 		}
-		$mountPoints = self::readData($isPersonal);
+		$mountPoints = self::readData($isPersonal ? OCP\User::getUser() : NULL);
 		// Remove mount point
 		unset($mountPoints[$mountType][$applicable][$mountPoint]);
 		// Unset parent arrays if empty
@@ -444,20 +436,20 @@ class OC_Mount_Config {
 				unset($mountPoints[$mountType]);
 			}
 		}
-		self::writeData($isPersonal, $mountPoints);
+		self::writeData($isPersonal ? OCP\User::getUser() : NULL, $mountPoints);
 		return true;
 	}
 
 	/**
 	* Read the mount points in the config file into an array
-	* @param boolean $isPersonal Personal or system config file
+	* @param string|null $user If not null, personal for $user, otherwise system
 	* @return array
 	*/
-	private static function readData($isPersonal) {
+	private static function readData($user = NULL) {
 		$parser = new \OC\ArrayParser();
-		if ($isPersonal) {
-			$phpFile = OC_User::getHome(OCP\User::getUser()).'/mount.php';
-			$jsonFile = OC_User::getHome(OCP\User::getUser()).'/mount.json';
+		if (isset($user)) {
+			$phpFile = OC_User::getHome($user).'/mount.php';
+			$jsonFile = OC_User::getHome($user).'/mount.json';
 		} else {
 			$phpFile = OC::$SERVERROOT.'/config/mount.php';
 			$datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data/');
@@ -479,13 +471,12 @@ class OC_Mount_Config {
 
 	/**
 	* Write the mount points to the config file
-	* @param bool Personal or system config file
-	* @param array Mount points
-	* @param boolean $isPersonal
+	* @param string|null $user If not null, personal for $user, otherwise system
+	* @param array $data Mount points
 	*/
-	private static function writeData($isPersonal, $data) {
-		if ($isPersonal) {
-			$file = OC_User::getHome(OCP\User::getUser()).'/mount.json';
+	private static function writeData($user, $data) {
+		if (isset($user)) {
+			$file = OC_User::getHome($user).'/mount.json';
 		} else {
 			$datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data/');
 			$file = \OC_Config::getValue('mount_file', $datadir . '/mount.json');
@@ -619,9 +610,9 @@ class OC_Mount_Config {
 
 	/**
 	 * Returns a dependency missing message
-	 * @param $l OC_L10N
-	 * @param $module string
-	 * @param $backend string
+	 * @param OC_L10N $l
+	 * @param string $module
+	 * @param string $backend
 	 * @return string
 	 */
 	private static function getSingleDependencyMessage($l, $module, $backend) {
@@ -667,7 +658,7 @@ class OC_Mount_Config {
 	/**
 	 * Encrypt a single password
 	 * @param string $password plain text password
-	 * @return encrypted password
+	 * @return string encrypted password
 	 */
 	private static function encryptPassword($password) {
 		$cipher = self::getCipher();
@@ -679,7 +670,7 @@ class OC_Mount_Config {
 	/**
 	 * Decrypts a single password
 	 * @param string $encryptedPassword encrypted password
-	 * @return plain text password
+	 * @return string plain text password
 	 */
 	private static function decryptPassword($encryptedPassword) {
 		$cipher = self::getCipher();
@@ -690,6 +681,28 @@ class OC_Mount_Config {
 		return $cipher->decrypt($binaryPassword);
 	}
 
+	/**
+	 * Merges mount points
+	 * @param array $data Existing mount points
+	 * @param array $mountPoint New mount point
+	 * @param string $mountType
+	 * @return array
+	 */
+	private static function mergeMountPoints($data, $mountPoint, $mountType) {
+		$applicable = key($mountPoint);
+		if (isset($data[$mountType])) {
+			if (isset($data[$mountType][$applicable])) {
+				$data[$mountType][$applicable]
+					= array_merge($data[$mountType][$applicable], $mountPoint[$applicable]);
+			} else {
+				$data[$mountType] = array_merge($data[$mountType], $mountPoint);
+			}
+		} else {
+			$data[$mountType] = $mountPoint;
+		}
+		return $data;
+	}
+
 	/**
 	 * Returns the encryption cipher
 	 */
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 38de3360f2..0b624b2717 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -63,10 +63,10 @@ class Dropbox extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * @brief Returns the path's metadata
+	 * Returns the path's metadata
 	 * @param string $path path for which to return the metadata
-	 * @param $list if true, also return the directory's contents
-	 * @return directory contents if $list is true, file metadata if $list is
+	 * @param bool $list if true, also return the directory's contents
+	 * @return mixed directory contents if $list is true, file metadata if $list is
 	 * false, null if the file doesn't exist or "false" if the operation failed
 	 */
 	private function getMetaData($path, $list = false) {
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index b3f8b1444a..2650a94f85 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -64,7 +64,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 
 	/**
 	 * Unlinks file or directory
-	 * @param string @path
+	 * @param string $path
 	 */
 	public function unlink($path) {
 		if ($this->is_dir($path)) {
diff --git a/apps/files_external/lib/irods.php b/apps/files_external/lib/irods.php
deleted file mode 100644
index 7a7e900fbf..0000000000
--- a/apps/files_external/lib/irods.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Thomas Müller <thomas.mueller@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace OC\Files\Storage;
-
-set_include_path(get_include_path() . PATH_SEPARATOR .
-	\OC_App::getAppPath('files_external') . '/3rdparty/irodsphp/prods/src');
-
-ob_start();
-require_once 'ProdsConfig.inc.php';
-require_once 'ProdsStreamer.class.php';
-ob_end_clean();
-
-class iRODS extends \OC\Files\Storage\StreamWrapper{
-	private $password;
-	private $user;
-	private $host;
-	private $port;
-	private $zone;
-	private $root;
-	private $use_logon_credentials;
-	private $auth_mode;
-
-	public function __construct($params) {
-		if (isset($params['host'])) {
-			$this->host = $params['host'];
-			$this->port = isset($params['port']) ? $params['port'] : 1247;
-			$this->user = isset($params['user']) ? $params['user'] : '';
-			$this->password = isset($params['password']) ? $params['password'] : '';
-			$this->use_logon_credentials = ($params['use_logon_credentials'] === 'true');
-			$this->zone = $params['zone'];
-			$this->auth_mode = isset($params['auth_mode']) ? $params['auth_mode'] : '';
-
-			$this->root = isset($params['root']) ? $params['root'] : '/';
-			if ( ! $this->root || $this->root[0] !== '/') {
-				$this->root='/'.$this->root;
-			}
-
-			// take user and password from the session
-			if ($this->use_logon_credentials && \OC::$session->exists('irods-credentials'))
-			{
-				$params = \OC::$session->get('irods-credentials');
-				$this->user = $params['uid'];
-				$this->password = $params['password'];
-			}
-
-			//create the root folder if necessary
-			if ( ! $this->is_dir('')) {
-				$this->mkdir('');
-			}
-		} else {
-			throw new \Exception();
-		}
-
-	}
-
-	public static function login( $params ) {
-		\OC::$session->set('irods-credentials', $params);
-	}
-
-	public function getId(){
-		return 'irods::' . $this->user . '@' . $this->host . '/' . $this->root;
-	}
-
-	/**
-	 * construct the rods url
-	 * @param string $path
-	 * @return string
-	 */
-	public function constructUrl($path) {
-		$path = rtrim($path,'/');
-		if ( $path === '' || $path[0] !== '/') {
-			$path = '/'.$path;
-		}
-
-		// adding auth method
-		$userWithZone = $this->user.'.'.$this->zone;
-		if ($this->auth_mode !== '') {
-			$userWithZone .= '.'.$this->auth_mode;
-		}
-
-		// url wrapper schema is named rods
-		return 'rods://'.$userWithZone.':'.$this->password.'@'.$this->host.':'.$this->port.$this->root.$path;
-	}
-
-	public function filetype($path) {
-		return @filetype($this->constructUrl($path));
-	}
-
-	public function mkdir($path) {
-		return @mkdir($this->constructUrl($path));
-	}
-
-	public function touch($path, $mtime=null) {
-
-		// we cannot set a time
-		if ($mtime != null) {
-			return false;
-		}
-
-		$path = $this->constructUrl($path);
-
-		// if the file doesn't exist we create it
-		if (!file_exists($path)) {
-			file_put_contents($path, '');
-			return true;
-		}
-
-		// mtime updates are not supported
-		return false;
-	}
-
-	/**
-	 * check if a file or folder has been updated since $time
-	 * @param string $path
-	 * @param int $time
-	 * @return bool
-	 */
-	public function hasUpdated($path,$time) {
-		// this it a work around for folder mtimes -> we loop it's content
-		if ( $this->is_dir($path)) {
-			$actualTime=$this->collectionMTime($path);
-			return $actualTime>$time;
-		}
-
-		$actualTime=$this->filemtime($path);
-		return $actualTime>$time;
-	}
-
-	/**
-	 * get the best guess for the modification time of an iRODS collection
-	 * @param string $path
-	 */
-	private function collectionMTime($path) {
-		$dh = $this->opendir($path);
-		$lastCTime = $this->filemtime($path);
-		if(is_resource($dh)) {
-			while (($file = readdir($dh)) !== false) {
-				if ($file != '.' and $file != '..') {
-					$time = $this->filemtime($file);
-					if ($time > $lastCTime) {
-						$lastCTime = $time;
-					}
-				}
-			}
-		}
-		return $lastCTime;
-	}
-
-}
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index b1d355323d..6e53c4a993 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -83,7 +83,7 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
 
 	/**
 	 * Unlinks file or directory
-	 * @param string @path
+	 * @param string $path
 	 */
 	public function unlink($path) {
 		if ($this->is_dir($path)) {
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index a202d3843c..03364867b0 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -23,7 +23,7 @@
 namespace OC\Files\Storage;
 
 set_include_path(get_include_path() . PATH_SEPARATOR .
-        \OC_App::getAppPath('files_external') . '/3rdparty/php-opencloud/lib');
+	\OC_App::getAppPath('files_external') . '/3rdparty/php-opencloud/lib');
 require_once 'openstack.php';
 
 use \OpenCloud;
@@ -31,25 +31,25 @@ use \OpenCloud\Common\Exceptions;
 
 class Swift extends \OC\Files\Storage\Common {
 
-        /**
-         * @var \OpenCloud\ObjectStore
-         */
+	/**
+	 * @var \OpenCloud\ObjectStore
+	 */
 	private $connection;
-        /**
-         * @var \OpenCloud\ObjectStore\Container
-         */
+	/**
+	 * @var \OpenCloud\ObjectStore\Container
+	 */
 	private $container;
-        /**
-         * @var \OpenCloud\OpenStack
-         */
+	/**
+	 * @var \OpenCloud\OpenStack
+	 */
 	private $anchor;
-        /**
-         * @var string
-         */
+	/**
+	 * @var string
+	 */
 	private $bucket;
-        /**
-         * @var array
-         */
+	/**
+	 * @var array
+	 */
 	private static $tmpFiles = array();
 
 	/**
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 0d04e35e7f..df80ed1099 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -27,7 +27,7 @@
 											  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'])); ?>'>
+						<select id="selectBackend" data-configurations='<?php p(json_encode($_['backends'])); ?>'>
 							<option value="" disabled selected
 									style="display:none;"><?php p($l->t('Add storage')); ?></option>
 							<?php foreach ($_['backends'] as $class => $backend): ?>
diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php
index 767c0adf58..62aff4d1bc 100644
--- a/apps/files_external/tests/config.php
+++ b/apps/files_external/tests/config.php
@@ -28,7 +28,7 @@ return array(
 		'wait'=> 0
 	),
 	'owncloud'=>array(
-		'run'=>true,
+		'run'=>false,
 		'host'=>'localhost/owncloud',
 		'user'=>'test',
 		'password'=>'test',
diff --git a/apps/files_external/tests/dynamicmountconfig.php b/apps/files_external/tests/dynamicmountconfig.php
index 81a31e14c6..650299075e 100644
--- a/apps/files_external/tests/dynamicmountconfig.php
+++ b/apps/files_external/tests/dynamicmountconfig.php
@@ -22,8 +22,6 @@
 
 require_once __DIR__ . '/../../../lib/base.php';
 
-require __DIR__ . '/../lib/config.php';
-
 /**
  * Class Test_Mount_Config_Dummy_Backend
  */
diff --git a/apps/files_external/tests/irods.php b/apps/files_external/tests/irods.php
deleted file mode 100644
index 6aa9d3a3b0..0000000000
--- a/apps/files_external/tests/irods.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Thomas Müller <thomas.mueller@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace Test\Files\Storage;
-
-class iRODS extends Storage {
-
-	protected $backupGlobals = FALSE;
-
-	private $config;
-
-	public function setUp() {
-		$id = uniqid();
-		$this->config = include('files_external/tests/config.php');
-		if ( ! is_array($this->config) or ! isset($this->config['irods']) or ! $this->config['irods']['run']) {
-			$this->markTestSkipped('irods backend not configured');
-		}
-		$this->config['irods']['root'] .= $id; //make sure we have an new empty folder to work in
-		$this->instance = new \OC\Files\Storage\iRODS($this->config['irods']);
-	}
-
-	public function tearDown() {
-		if ($this->instance) {
-			\OCP\Files::rmdirr($this->instance->constructUrl(''));
-		}
-	}
-}
diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php
index 1921ec76af..14fe1d90b7 100644
--- a/apps/files_external/tests/mountconfig.php
+++ b/apps/files_external/tests/mountconfig.php
@@ -22,8 +22,6 @@
 
 require_once __DIR__ . '/../../../lib/base.php';
 
-require __DIR__ . '/../lib/config.php';
-
 class Test_Mount_Config_Dummy_Storage {
 	public function test() {
 		return true;
diff --git a/apps/files_sharing/ajax/list.php b/apps/files_sharing/ajax/list.php
index 4b64549625..82bacb3d38 100644
--- a/apps/files_sharing/ajax/list.php
+++ b/apps/files_sharing/ajax/list.php
@@ -20,11 +20,6 @@
  *
  */
 
-// only need filesystem apps
-$RUNTIME_APPTYPES=array('filesystem');
-
-// Init owncloud
-
 if(!\OC_App::isEnabled('files_sharing')){
 	exit;
 }
@@ -47,6 +42,9 @@ if (isset($_GET['dir'])) {
 	$relativePath = $_GET['dir'];
 }
 
+$sortAttribute = isset( $_GET['sort'] ) ? $_GET['sort'] : 'name';
+$sortDirection = isset( $_GET['sortdirection'] ) ? ($_GET['sortdirection'] === 'desc') : false;
+
 $data = \OCA\Files_Sharing\Helper::setupFromToken($token, $relativePath, $password);
 
 $linkItem = $data['linkItem'];
@@ -64,7 +62,7 @@ $data = array();
 $baseUrl = OCP\Util::linkTo('files_sharing', 'index.php') . '?t=' . urlencode($token) . '&dir=';
 
 // make filelist
-$files = \OCA\Files\Helper::getFiles($dir);
+$files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection);
 
 $formattedFiles = array();
 foreach ($files as $file) {
diff --git a/apps/files_sharing/ajax/publicpreview.php b/apps/files_sharing/ajax/publicpreview.php
index d12d212a2e..d8c892f1b7 100644
--- a/apps/files_sharing/ajax/publicpreview.php
+++ b/apps/files_sharing/ajax/publicpreview.php
@@ -16,6 +16,7 @@ $maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '36';
 $maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '36';
 $scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true;
 $token = array_key_exists('t', $_GET) ? (string) $_GET['t'] : '';
+$keepAspect = array_key_exists('a', $_GET) ? true : false;
 
 if($token === ''){
 	\OC_Response::setStatus(400); //400 Bad Request
@@ -70,6 +71,10 @@ if(substr($path, 0, 1) === '/') {
 	$path = substr($path, 1);
 }
 
+if ($keepAspect === true) {
+	$maxY = $maxX;
+}
+
 if($maxX === 0 || $maxY === 0) {
 	\OC_Response::setStatus(400); //400 Bad Request
 	\OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG);
@@ -84,8 +89,9 @@ try{
 	$preview->setMaxX($maxX);
 	$preview->setMaxY($maxY);
 	$preview->setScalingUp($scalingUp);
+	$preview->setKeepAspect($keepAspect);
 
-	$preview->show();
+	$preview->showPreview();
 } catch (\Exception $e) {
 	\OC_Response::setStatus(500);
 	\OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG);
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 9a199281a7..9b42c1e17b 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -13,6 +13,6 @@
 	</types>
 	<public>
 		<files>public.php</files>
-		<webdav>public.php</webdav>
+		<webdav>publicwebdav.php</webdav>
 	</public>
 </info>
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 06e454b7d7..7c2834dc9c 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -1,9 +1,9 @@
 <?php
 /** @var $this \OCP\Route\IRouter */
-$this->create('core_ajax_public_preview', '/publicpreview.png')->action(
-function() {
-	require_once __DIR__ . '/../ajax/publicpreview.php';
-});
+$this->create('core_ajax_public_preview', '/publicpreview')->action(
+	function() {
+		require_once __DIR__ . '/../ajax/publicpreview.php';
+	});
 
 // OCS API
 
diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version
index bd73f47072..267577d47e 100644
--- a/apps/files_sharing/appinfo/version
+++ b/apps/files_sharing/appinfo/version
@@ -1 +1 @@
-0.4
+0.4.1
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index efd8d4950d..70897af9eb 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -1,7 +1,3 @@
-#controls {
-	left: 0;
-}
-
 #preview {
 	background: #fff;
 	text-align: center;
@@ -86,9 +82,6 @@ thead {
 	margin-left: auto;
 	margin-right: auto;
 }
-.directDownload .button img {
-	vertical-align: text-bottom;
-}
 
 .directLink label {
 	font-weight: normal;
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index ae2412f6a3..d3d4479215 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -8,77 +8,164 @@
  *
  */
 
-/* global OC, FileActions, FileList, Files */
+/* global FileActions, Files */
+/* global dragOptions, folderDropOptions */
+OCA.Sharing = {};
+if (!OCA.Files) {
+	OCA.Files = {};
+}
+OCA.Sharing.PublicApp = {
+	_initialized: false,
 
-$(document).ready(function() {
+	initialize: function($el) {
+		if (this._initialized) {
+			return;
+		}
+		this._initialized = true;
+		// file list mode ?
+		if ($el.find('#filestable')) {
+			this.fileList = new OCA.Files.FileList(
+				$el,
+				{
+					scrollContainer: $(window),
+					dragOptions: dragOptions,
+					folderDropOptions: folderDropOptions
+				}
+			);
+			this.files = OCA.Files.Files;
+			this.files.initialize();
+		}
 
-	if (typeof FileActions !== 'undefined') {
 		var mimetype = $('#mimetype').val();
-		// Show file preview if previewer is available, images are already handled by the template
-		if (mimetype.substr(0, mimetype.indexOf('/')) != 'image' && $('.publicpreview').length === 0) {
-			// Trigger default action if not download TODO
-			var action = FileActions.getDefault(mimetype, 'file', OC.PERMISSION_READ);
-			if (typeof action !== 'undefined') {
-				action($('#filename').val());
+
+		if (typeof FileActions !== 'undefined') {
+			// Show file preview if previewer is available, images are already handled by the template
+			if (mimetype.substr(0, mimetype.indexOf('/')) !== 'image' && $('.publicpreview').length === 0) {
+				// Trigger default action if not download TODO
+				var action = FileActions.getDefault(mimetype, 'file', OC.PERMISSION_READ);
+				if (typeof action !== 'undefined') {
+					action($('#filename').val());
+				}
 			}
 		}
+
+		// dynamically load image previews
+		if (mimetype.substr(0, mimetype.indexOf('/')) === 'image' ) {
+
+			var params = {
+				x: $(document).width() * window.devicePixelRatio,
+				a: 'true',
+				file: encodeURIComponent($('#dir').val() + $('#filename').val()),
+				t: $('#sharingToken').val()
+			};
+
+			var img = $('<img class="publicpreview">');
+			img.attr('src', OC.filePath('files_sharing', 'ajax', 'publicpreview.php') + '?' + OC.buildQueryString(params));
+			img.appendTo('#imgframe');
+		}
+
+		if (this.fileList) {
+			// TODO: move this to a separate PublicFileList class that extends OCA.Files.FileList (+ unit tests)
+			this.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,
+					files: filename,
+					download: null
+				};
+				return OC.filePath('', '', 'public.php') + '?' + OC.buildQueryString(params);
+			};
+
+			this.fileList.getAjaxUrl = function(action, params) {
+				params = params || {};
+				params.t = $('#sharingToken').val();
+				return OC.filePath('files_sharing', 'ajax', action + '.php') + '?' + OC.buildQueryString(params);
+			};
+
+			this.fileList.linkTo = function(dir) {
+				var params = {
+					service: 'files',
+					t: $('#sharingToken').val(),
+					dir: dir
+				};
+				return OC.filePath('', '', 'public.php') + '?' + OC.buildQueryString(params);
+			};
+
+			this.fileList.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) {
+				var fileDirectory = '';
+				if(typeof data.files[0].relativePath !== 'undefined') {
+					fileDirectory = data.files[0].relativePath;
+				}
+
+				// Add custom data to the upload handler
+				data.formData = {
+					requesttoken: $('#publicUploadRequestToken').val(),
+					dirToken: $('#dirToken').val(),
+					subdir: $('input#dir').val(),
+					file_directory: fileDirectory
+				};
+			});
+
+			this.fileActions = _.extend({}, OCA.Files.FileActions);
+			this.fileActions.registerDefaultActions(this.fileList);
+			delete this.fileActions.actions.all.Share;
+			this.fileList.setFileActions(this.fileActions);
+
+			this.fileList.changeDirectory($('#dir').val() || '/', false, true);
+
+			// URL history handling
+			this.fileList.$el.on('changeDirectory', _.bind(this._onDirectoryChanged, this));
+			OC.Util.History.addOnPopStateHandler(_.bind(this._onUrlChanged, this));
+		}
+
+		$(document).on('click', '#directLink', function() {
+			$(this).focus();
+			$(this).select();
+		});
+
+		// legacy
+		window.FileList = this.fileList;
+	},
+
+	_onDirectoryChanged: function(e) {
+		OC.Util.History.pushState({
+			service: 'files',
+			t: $('#sharingToken').val(),
+			// arghhhh, why is this not called "dir" !?
+			path: e.dir
+		});
+	},
+
+	_onUrlChanged: function(params) {
+		this.fileList.changeDirectory(params.path || params.dir, false, true);
 	}
+};
 
-	// 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(),
+$(document).ready(function() {
+	var App = OCA.Sharing.PublicApp;
+	App.initialize($('#preview'));
+
+	// HACK: for oc-dialogs previews that depends on Files:
+	Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
+		return App.fileList.lazyLoadPreview({
 			path: path,
-			files: filename,
-			download: null
-		};
-		return OC.filePath('', '', 'public.php') + '?' + OC.buildQueryString(params);
+			mime: mime,
+			callback: ready,
+			width: width,
+			height: height,
+			etag: etag
+		});
 	};
-
-	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) {
-		var fileDirectory = '';
-		if(typeof data.files[0].relativePath !== 'undefined') {
-			fileDirectory = data.files[0].relativePath;
-		}
-
-		// Add custom data to the upload handler
-		data.formData = {
-			requesttoken: $('#publicUploadRequestToken').val(),
-			dirToken: $('#dirToken').val(),
-			subdir: $('input#dir').val(),
-			file_directory: fileDirectory
-		};
-	});
-
-	$(document).on('click', '#directLink', function() {
-		$(this).focus();
-		$(this).select();
-	});
-
 });
+
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 3c7c9239a6..973c63c5d7 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -8,15 +8,15 @@
  *
  */
 
-/* global OC, t, FileList, FileActions */
+/* global FileList, FileActions */
 $(document).ready(function() {
 
-	var disableSharing = $('#disableSharing').data('status'),
-		sharesLoaded = false;
+	var sharesLoaded = false;
 
-	if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined'  && !disableSharing) {
-		var oldCreateRow = FileList._createRow;
-		FileList._createRow = function(fileData) {
+	if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined') {
+		// TODO: make a separate class for this or a hook or jQuery event ?
+		var oldCreateRow = OCA.Files.FileList.prototype._createRow;
+		OCA.Files.FileList.prototype._createRow = function(fileData) {
 			var tr = oldCreateRow.apply(this, arguments);
 			if (fileData.shareOwner) {
 				tr.attr('data-share-owner', fileData.shareOwner);
@@ -25,14 +25,16 @@ $(document).ready(function() {
 		};
 
 		$('#fileList').on('fileActionsReady',function(){
-
-			var allShared = $('#fileList').find('[data-share-owner] [data-Action="Share"]');
+			var $fileList = $(this);
+			var allShared = $fileList.find('[data-share-owner] [data-Action="Share"]');
 			allShared.addClass('permanent');
 			allShared.find('span').text(function(){
 				var $owner = $(this).closest('tr').attr('data-share-owner');
 				return ' ' + t('files_sharing', 'Shared by {owner}', {owner: $owner});
 			});
 
+			// FIXME: these calls are also working on hard-coded
+			// list selectors...
 			if (!sharesLoaded){
 				OC.Share.loadIcons('file');
 				// assume that we got all shares, so switching directories
diff --git a/apps/files_sharing/l10n/ar.php b/apps/files_sharing/l10n/ar.php
index f796f7ec59..3f8b49913f 100644
--- a/apps/files_sharing/l10n/ar.php
+++ b/apps/files_sharing/l10n/ar.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "انتهت صلاحية الرابط",
 "sharing is disabled" => "المشاركة غير مفعلة",
 "For more info, please ask the person who sent this link." => "لمزيد من المعلومات، يرجى سؤال الشخص الذي أرسل هذا الرابط",
-"shared by %s" => "مشاركة من قبل %s",
+"Download" => "تحميل",
 "Download %s" => "تحميل %s",
 "Direct link" => "رابط مباشر"
 );
diff --git a/apps/files_sharing/l10n/ast.php b/apps/files_sharing/l10n/ast.php
index 02a2f6fb62..fa3704ea6b 100644
--- a/apps/files_sharing/l10n/ast.php
+++ b/apps/files_sharing/l10n/ast.php
@@ -1,6 +1,17 @@
 <?php
 $TRANSLATIONS = array(
 "Shared by {owner}" => "Compartíu por {owner}",
-"Password" => "Contraseña"
+"This share is password-protected" => "Esta compartición tien contraseña protexida",
+"The password is wrong. Try again." => "La contraseña ye incorreuta. Inténtalo otra vegada.",
+"Password" => "Contraseña",
+"Sorry, this link doesn’t seem to work anymore." => "Sentímoslo, esti enllaz paez que yá nun furrula.",
+"Reasons might be:" => "Les razones pueden ser: ",
+"the item was removed" => "desanicióse l'elementu",
+"the link expired" => "l'enllaz caducó",
+"sharing is disabled" => "compartir ta desactiváu",
+"For more info, please ask the person who sent this link." => "Pa más información, entrúga-y a la persona qu'unvió esti enllaz",
+"Download" => "Baxar",
+"Download %s" => "Descargar %s",
+"Direct link" => "Enllaz direutu"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/bg_BG.php b/apps/files_sharing/l10n/bg_BG.php
index 37e2ca3337..80bc117687 100644
--- a/apps/files_sharing/l10n/bg_BG.php
+++ b/apps/files_sharing/l10n/bg_BG.php
@@ -1,6 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Парола",
-"shared by %s" => "споделено от %s"
+"Download" => "Изтегляне"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/bn_BD.php b/apps/files_sharing/l10n/bn_BD.php
index 1d737247d8..6c5809f5a0 100644
--- a/apps/files_sharing/l10n/bn_BD.php
+++ b/apps/files_sharing/l10n/bn_BD.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "কূটশব্দ"
+"Password" => "কূটশব্দ",
+"Download" => "ডাউনলোড"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
index 6432219650..8b23af6964 100644
--- a/apps/files_sharing/l10n/ca.php
+++ b/apps/files_sharing/l10n/ca.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "l'enllaç ha vençut",
 "sharing is disabled" => "s'ha desactivat la compartició",
 "For more info, please ask the person who sent this link." => "Per més informació contacteu amb qui us ha enviat l'enllaç.",
-"shared by %s" => "compartit per %s",
+"Download" => "Baixa",
 "Download %s" => "Baixa %s",
 "Direct link" => "Enllaç directe"
 );
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
index e7a8b16f00..d77cc79494 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ílí %s",
+"Download" => "Stáhnout",
 "Download %s" => "Stáhnout %s",
 "Direct link" => "Přímý odkaz"
 );
diff --git a/apps/files_sharing/l10n/cy_GB.php b/apps/files_sharing/l10n/cy_GB.php
index bf05f890a9..0012a9fa7f 100644
--- a/apps/files_sharing/l10n/cy_GB.php
+++ b/apps/files_sharing/l10n/cy_GB.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Cyfrinair"
+"Password" => "Cyfrinair",
+"Download" => "Llwytho i lawr"
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_sharing/l10n/da.php b/apps/files_sharing/l10n/da.php
index 6c6a39c295..07fc5392a8 100644
--- a/apps/files_sharing/l10n/da.php
+++ b/apps/files_sharing/l10n/da.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "linket udløb",
 "sharing is disabled" => "deling er deaktiveret",
 "For more info, please ask the person who sent this link." => "For yderligere information, kontakt venligst personen der sendte linket. ",
-"shared by %s" => "delt af %s",
+"Download" => "Download",
 "Download %s" => "Download %s",
 "Direct link" => "Direkte link"
 );
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index a924881844..2ca1a006a9 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "Der Link ist abgelaufen",
 "sharing is disabled" => "Teilen ist deaktiviert",
 "For more info, please ask the person who sent this link." => "Für mehr Informationen, frage bitte die Person, die Dir diesen Link geschickt hat.",
-"shared by %s" => "Freigegeben von %s",
+"Download" => "Herunterladen",
 "Download %s" => "Download %s",
 "Direct link" => "Direkter Link"
 );
diff --git a/apps/files_sharing/l10n/de_AT.php b/apps/files_sharing/l10n/de_AT.php
index 142892bc9a..08ef4d9245 100644
--- a/apps/files_sharing/l10n/de_AT.php
+++ b/apps/files_sharing/l10n/de_AT.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Passwort"
+"Password" => "Passwort",
+"Download" => "Herunterladen"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de_CH.php b/apps/files_sharing/l10n/de_CH.php
index 6ea0a4654c..8d3c5f6ed7 100644
--- a/apps/files_sharing/l10n/de_CH.php
+++ b/apps/files_sharing/l10n/de_CH.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
 "the item was removed" => "Das Element wurde entfernt",
 "the link expired" => "Der Link ist abgelaufen",
 "sharing is disabled" => "Teilen ist deaktiviert",
-"For more info, please ask the person who sent this link." => "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat."
+"For more info, please ask the person who sent this link." => "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.",
+"Download" => "Herunterladen"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php
index e7bd75a2e0..021ec041aa 100644
--- a/apps/files_sharing/l10n/de_DE.php
+++ b/apps/files_sharing/l10n/de_DE.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "Der Link ist abgelaufen",
 "sharing is disabled" => "Teilen ist deaktiviert",
 "For more info, please ask the person who sent this link." => "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.",
-"shared by %s" => "Geteilt von %s",
+"Download" => "Herunterladen",
 "Download %s" => "Download %s",
 "Direct link" => "Direkte Verlinkung"
 );
diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php
index 10ff594c98..eb559a682d 100644
--- a/apps/files_sharing/l10n/el.php
+++ b/apps/files_sharing/l10n/el.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "ο σύνδεσμος έληξε",
 "sharing is disabled" => "ο διαμοιρασμός απενεργοποιήθηκε",
 "For more info, please ask the person who sent this link." => "Για περισσότερες πληροφορίες, παρακαλώ ρωτήστε το άτομο που σας έστειλε αυτόν τον σύνδεσμο.",
-"shared by %s" => "διαμοιράστηκε από %s",
+"Download" => "Λήψη",
 "Download %s" => "Λήψη %s",
 "Direct link" => "Άμεσος σύνδεσμος"
 );
diff --git a/apps/files_sharing/l10n/en@pirate.php b/apps/files_sharing/l10n/en@pirate.php
index ab628e1717..a927110900 100644
--- a/apps/files_sharing/l10n/en@pirate.php
+++ b/apps/files_sharing/l10n/en@pirate.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Secret Code"
+"Password" => "Secret Code",
+"Download" => "Download"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/en_GB.php b/apps/files_sharing/l10n/en_GB.php
index 02663f96b8..e263f3cf6d 100644
--- a/apps/files_sharing/l10n/en_GB.php
+++ b/apps/files_sharing/l10n/en_GB.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "the link expired",
 "sharing is disabled" => "sharing is disabled",
 "For more info, please ask the person who sent this link." => "For more info, please ask the person who sent this link.",
-"shared by %s" => "shared by %s",
+"Download" => "Download",
 "Download %s" => "Download %s",
 "Direct link" => "Direct link"
 );
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
index 1148d51697..127ac02206 100644
--- a/apps/files_sharing/l10n/eo.php
+++ b/apps/files_sharing/l10n/eo.php
@@ -9,6 +9,7 @@ $TRANSLATIONS = array(
 "the link expired" => "la ligilo eksvalidiĝis",
 "sharing is disabled" => "kunhavigo malkapablas",
 "For more info, please ask the person who sent this link." => "Por plia informo, bonvolu peti al la persono, kiu sendis ĉi tiun ligilon.",
+"Download" => "Elŝuti",
 "Direct link" => "Direkta ligilo"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php
index 2e3f3b8500..6978c7ce72 100644
--- a/apps/files_sharing/l10n/es.php
+++ b/apps/files_sharing/l10n/es.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "el enlace expiró",
 "sharing is disabled" => "compartir está desactivado",
 "For more info, please ask the person who sent this link." => "Para mayor información, contacte a la persona que le envió el enlace.",
-"shared by %s" => "Compartido por %s",
+"Download" => "Descargar",
 "Download %s" => "Descargar %s",
 "Direct link" => "Enlace directo"
 );
diff --git a/apps/files_sharing/l10n/es_AR.php b/apps/files_sharing/l10n/es_AR.php
index 95cfadc1db..9a9db79493 100644
--- a/apps/files_sharing/l10n/es_AR.php
+++ b/apps/files_sharing/l10n/es_AR.php
@@ -10,6 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "el enlace expiró",
 "sharing is disabled" => "compartir está desactivado",
 "For more info, please ask the person who sent this link." => "Para mayor información, contactá a la persona que te mandó el enlace.",
+"Download" => "Descargar",
 "Direct link" => "Vínculo directo"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es_CL.php b/apps/files_sharing/l10n/es_CL.php
index 42a2f066c6..083bc4d4e2 100644
--- a/apps/files_sharing/l10n/es_CL.php
+++ b/apps/files_sharing/l10n/es_CL.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Clave"
+"Password" => "Clave",
+"Download" => "Descargar"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es_MX.php b/apps/files_sharing/l10n/es_MX.php
index 9168e25308..1a1ebe4b4c 100644
--- a/apps/files_sharing/l10n/es_MX.php
+++ b/apps/files_sharing/l10n/es_MX.php
@@ -10,6 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "el enlace expiró",
 "sharing is disabled" => "compartir está desactivado",
 "For more info, please ask the person who sent this link." => "Para mayor información, contacte a la persona que le envió el enlace.",
+"Download" => "Descargar",
 "Direct link" => "Enlace directo"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index 7150f05da2..e95e627195 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "link on aegunud",
 "sharing is disabled" => "jagamine on peatatud",
 "For more info, please ask the person who sent this link." => "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole.",
-"shared by %s" => "jagas %s",
+"Download" => "Lae alla",
 "Download %s" => "Laadi alla %s",
 "Direct link" => "Otsene link"
 );
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
index 5f13a73e1f..8be7bcb2a4 100644
--- a/apps/files_sharing/l10n/eu.php
+++ b/apps/files_sharing/l10n/eu.php
@@ -10,7 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "lotura iraungi da",
 "sharing is disabled" => "elkarbanatzea ez dago gaituta",
 "For more info, please ask the person who sent this link." => "Informazio gehiagorako, mesedez eskatu lotura hau bidali zuen pertsonari",
-"shared by %s" => "%sk partekatuta",
+"Download" => "Deskargatu",
+"Download %s" => "Deskargatu %s",
 "Direct link" => "Lotura zuzena"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/eu_ES.php b/apps/files_sharing/l10n/eu_ES.php
new file mode 100644
index 0000000000..e6e5bc7cbf
--- /dev/null
+++ b/apps/files_sharing/l10n/eu_ES.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Download" => "Deskargatu"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/fa.php b/apps/files_sharing/l10n/fa.php
index 9b0a1dbc9d..fb6a4bc870 100644
--- a/apps/files_sharing/l10n/fa.php
+++ b/apps/files_sharing/l10n/fa.php
@@ -1,7 +1,17 @@
 <?php
 $TRANSLATIONS = array(
 "Shared by {owner}" => "اشتراک گذارنده {owner}",
+"This share is password-protected" => "این اشتراک توسط رمز عبور محافظت می شود",
 "The password is wrong. Try again." => "رمزعبور اشتباه می باشد. دوباره امتحان کنید.",
-"Password" => "گذرواژه"
+"Password" => "گذرواژه",
+"Sorry, this link doesn’t seem to work anymore." => "متاسفانه این پیوند دیگر کار نمی کند",
+"Reasons might be:" => "ممکن است به این دلایل باشد:",
+"the item was removed" => "این مورد حذف شده است",
+"the link expired" => "این پیوند منقضی شده است",
+"sharing is disabled" => "قابلیت اشتراک گذاری غیرفعال است",
+"For more info, please ask the person who sent this link." => "برای اطلاعات بیشتر، لطفا از شخصی که این پیوند را ارسال کرده سوال بفرمایید.",
+"Download" => "دانلود",
+"Download %s" => "دانلود %s",
+"Direct link" => "پیوند مستقیم"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
index e8ca368c71..851463c4b8 100644
--- a/apps/files_sharing/l10n/fi_FI.php
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "linkki vanheni",
 "sharing is disabled" => "jakaminen on poistettu käytöstä",
 "For more info, please ask the person who sent this link." => "Kysy lisätietoja henkilöltä, jolta sait linkin.",
-"shared by %s" => "jakanut %s",
+"Download" => "Lataa",
 "Download %s" => "Lataa %s",
 "Direct link" => "Suora linkki"
 );
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index 8e083f4ca0..a5b75e412f 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "le lien a expiré",
 "sharing is disabled" => "le partage est désactivé",
 "For more info, please ask the person who sent this link." => "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien.",
-"shared by %s" => "partagé par %s",
+"Download" => "Télécharger",
 "Download %s" => "Télécharger %s",
 "Direct link" => "Lien direct"
 );
diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php
index a04e823423..f5e1c6645f 100644
--- a/apps/files_sharing/l10n/gl.php
+++ b/apps/files_sharing/l10n/gl.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "a ligazón caducou",
 "sharing is disabled" => "foi desactivada a compartición",
 "For more info, please ask the person who sent this link." => "Para obter máis información, pregúntelle á persoa que lle enviou a ligazón.",
-"shared by %s" => "compartido por %s",
+"Download" => "Descargar",
 "Download %s" => "Descargar %s",
 "Direct link" => "Ligazón directa"
 );
diff --git a/apps/files_sharing/l10n/he.php b/apps/files_sharing/l10n/he.php
index 9ba86d0772..e56fdb2c80 100644
--- a/apps/files_sharing/l10n/he.php
+++ b/apps/files_sharing/l10n/he.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Shared by {owner}" => "שותף בידי {owner}",
-"Password" => "סיסמא"
+"Password" => "סיסמא",
+"Download" => "הורדה"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hr.php b/apps/files_sharing/l10n/hr.php
index 60c01d30b5..16776cdba2 100644
--- a/apps/files_sharing/l10n/hr.php
+++ b/apps/files_sharing/l10n/hr.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Lozinka"
+"Password" => "Lozinka",
+"Download" => "Preuzimanje"
 );
 $PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php
index 787a22fe6c..8221011610 100644
--- a/apps/files_sharing/l10n/hu_HU.php
+++ b/apps/files_sharing/l10n/hu_HU.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "lejárt a link érvényességi ideje",
 "sharing is disabled" => "letiltásra került a megosztás",
 "For more info, please ask the person who sent this link." => "További információért forduljon ahhoz, aki ezt a linket küldte Önnek!",
-"shared by %s" => "Megosztotta: %s",
+"Download" => "Letöltés",
 "Direct link" => "Közvetlen link"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ia.php b/apps/files_sharing/l10n/ia.php
index 9ec82f20df..03e2deb431 100644
--- a/apps/files_sharing/l10n/ia.php
+++ b/apps/files_sharing/l10n/ia.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Contrasigno"
+"Password" => "Contrasigno",
+"Download" => "Discargar"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/id.php b/apps/files_sharing/l10n/id.php
index e4668a7fb5..72670c23b3 100644
--- a/apps/files_sharing/l10n/id.php
+++ b/apps/files_sharing/l10n/id.php
@@ -10,6 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "tautan telah kadaluarsa",
 "sharing is disabled" => "berbagi dinonaktifkan",
 "For more info, please ask the person who sent this link." => "Untuk info lebih lanjut, silakan tanyakan orang yang mengirim tautan ini.",
+"Download" => "Unduh",
 "Direct link" => "Tautan langsung"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/is.php b/apps/files_sharing/l10n/is.php
index c4a1c58940..795dfeb6bf 100644
--- a/apps/files_sharing/l10n/is.php
+++ b/apps/files_sharing/l10n/is.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Lykilorð"
+"Password" => "Lykilorð",
+"Download" => "Niðurhal"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index 7efa458460..94c2a66808 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "il collegamento è scaduto",
 "sharing is disabled" => "la condivisione è disabilitata",
 "For more info, please ask the person who sent this link." => "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento.",
-"shared by %s" => "condiviso da %s",
+"Download" => "Scarica",
 "Download %s" => "Scarica %s",
 "Direct link" => "Collegamento diretto"
 );
diff --git a/apps/files_sharing/l10n/ja.php b/apps/files_sharing/l10n/ja.php
index 7e6461c608..a45da97dca 100644
--- a/apps/files_sharing/l10n/ja.php
+++ b/apps/files_sharing/l10n/ja.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "リンクの期限が切れています",
 "sharing is disabled" => "共有が無効になっています",
 "For more info, please ask the person who sent this link." => "不明な点は、こちらのリンクの提供者に確認をお願いします。",
-"shared by %s" => "%s で共有中",
+"Download" => "ダウンロード",
 "Download %s" => "%s をダウンロード",
 "Direct link" => "リンク"
 );
diff --git a/apps/files_sharing/l10n/jv.php b/apps/files_sharing/l10n/jv.php
new file mode 100644
index 0000000000..690632bdba
--- /dev/null
+++ b/apps/files_sharing/l10n/jv.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Download" => "Njipuk"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ka_GE.php b/apps/files_sharing/l10n/ka_GE.php
index 5fc48c9fd9..132bcb274c 100644
--- a/apps/files_sharing/l10n/ka_GE.php
+++ b/apps/files_sharing/l10n/ka_GE.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Shared by {owner}" => "გაზიარდა {owner} –ის მიერ",
-"Password" => "პაროლი"
+"Password" => "პაროლი",
+"Download" => "ჩამოტვირთვა"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/km.php b/apps/files_sharing/l10n/km.php
index 99b97c914e..75f5679d97 100644
--- a/apps/files_sharing/l10n/km.php
+++ b/apps/files_sharing/l10n/km.php
@@ -1,6 +1,17 @@
 <?php
 $TRANSLATIONS = array(
+"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." => "សម្រាប់​ព័ត៌មាន​បន្ថែម សូម​សួរ​អ្នក​ដែល​ផ្ញើ​តំណ​នេះ។",
+"Download" => "ទាញយក",
+"Download %s" => "ទាញយក %s",
+"Direct link" => "តំណ​ផ្ទាល់"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ko.php b/apps/files_sharing/l10n/ko.php
index a4593fbd6c..00818abf4a 100644
--- a/apps/files_sharing/l10n/ko.php
+++ b/apps/files_sharing/l10n/ko.php
@@ -10,6 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "링크가 만료됨",
 "sharing is disabled" => "공유가 비활성화됨",
 "For more info, please ask the person who sent this link." => "자세한 정보는 링크를 보낸 사람에게 문의하십시오.",
+"Download" => "다운로드",
 "Direct link" => "직접 링크"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ku_IQ.php b/apps/files_sharing/l10n/ku_IQ.php
index d433885e67..b16e87d81c 100644
--- a/apps/files_sharing/l10n/ku_IQ.php
+++ b/apps/files_sharing/l10n/ku_IQ.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "وشەی تێپەربو"
+"Password" => "وشەی تێپەربو",
+"Download" => "داگرتن"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php
index b253e795df..a3e9813822 100644
--- a/apps/files_sharing/l10n/lb.php
+++ b/apps/files_sharing/l10n/lb.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Den Passwuert ass incorrect. Probeier ed nach eng keier.",
-"Password" => "Passwuert"
+"Password" => "Passwuert",
+"Download" => "Download"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php
index 5db5ae275e..4c05e9217a 100644
--- a/apps/files_sharing/l10n/lt_LT.php
+++ b/apps/files_sharing/l10n/lt_LT.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "baigėsi nuorodos galiojimo laikas",
 "sharing is disabled" => "dalinimasis yra išjungtas",
 "For more info, please ask the person who sent this link." => "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą.",
-"shared by %s" => "pasidalino %s",
+"Download" => "Atsisiųsti",
 "Direct link" => "Tiesioginė nuoroda"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/lv.php b/apps/files_sharing/l10n/lv.php
index 834d7c1721..693f91d3b5 100644
--- a/apps/files_sharing/l10n/lv.php
+++ b/apps/files_sharing/l10n/lv.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Shared by {owner}" => "Dalījās {owner}",
-"Password" => "Parole"
+"Password" => "Parole",
+"Download" => "Lejupielādēt"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/mk.php b/apps/files_sharing/l10n/mk.php
index 6afa5fc684..b7281825a8 100644
--- a/apps/files_sharing/l10n/mk.php
+++ b/apps/files_sharing/l10n/mk.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Shared by {owner}" => "Споделени од {owner}",
-"Password" => "Лозинка"
+"Password" => "Лозинка",
+"Download" => "Преземи"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_sharing/l10n/ms_MY.php b/apps/files_sharing/l10n/ms_MY.php
index 89d11f49fd..43ea0b2d88 100644
--- a/apps/files_sharing/l10n/ms_MY.php
+++ b/apps/files_sharing/l10n/ms_MY.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Kata laluan"
+"Password" => "Kata laluan",
+"Download" => "Muat turun"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/my_MM.php b/apps/files_sharing/l10n/my_MM.php
index 475d642743..ff92e898ed 100644
--- a/apps/files_sharing/l10n/my_MM.php
+++ b/apps/files_sharing/l10n/my_MM.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "စကားဝှက်"
+"Password" => "စကားဝှက်",
+"Download" => "ဒေါင်းလုတ်"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php
index 6427d71670..193ee7165e 100644
--- a/apps/files_sharing/l10n/nb_NO.php
+++ b/apps/files_sharing/l10n/nb_NO.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "lenken er utløpt",
 "sharing is disabled" => "deling er deaktivert",
 "For more info, please ask the person who sent this link." => "For mer informasjon, spør personen som sendte lenken.",
-"shared by %s" => "delt av %s",
+"Download" => "Last ned",
 "Direct link" => "Direkte lenke"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php
index 6151733f54..e35898862c 100644
--- a/apps/files_sharing/l10n/nl.php
+++ b/apps/files_sharing/l10n/nl.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "de link is verlopen",
 "sharing is disabled" => "delen is uitgeschakeld",
 "For more info, please ask the person who sent this link." => "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd.",
-"shared by %s" => "gedeeld door %s",
+"Download" => "Downloaden",
 "Download %s" => "Download %s",
 "Direct link" => "Directe link"
 );
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
index 6f7968e199..e85c019d5c 100644
--- a/apps/files_sharing/l10n/nn_NO.php
+++ b/apps/files_sharing/l10n/nn_NO.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
 "the item was removed" => "fila/mappa er fjerna",
 "the link expired" => "lenkja har gått ut på dato",
 "sharing is disabled" => "deling er slått av",
-"For more info, please ask the person who sent this link." => "Spør den som sende deg lenkje om du vil ha meir informasjon."
+"For more info, please ask the person who sent this link." => "Spør den som sende deg lenkje om du vil ha meir informasjon.",
+"Download" => "Last ned"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/oc.php b/apps/files_sharing/l10n/oc.php
index c67cdf272f..15ef1720ad 100644
--- a/apps/files_sharing/l10n/oc.php
+++ b/apps/files_sharing/l10n/oc.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Senhal"
+"Password" => "Senhal",
+"Download" => "Avalcarga"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/pa.php b/apps/files_sharing/l10n/pa.php
index 6fee1e95f0..43632737a2 100644
--- a/apps/files_sharing/l10n/pa.php
+++ b/apps/files_sharing/l10n/pa.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "ਪਾਸਵਰ"
+"Password" => "ਪਾਸਵਰ",
+"Download" => "ਡਾਊਨਲੋਡ"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
index 4ecdced1a1..bf62ead107 100644
--- a/apps/files_sharing/l10n/pl.php
+++ b/apps/files_sharing/l10n/pl.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "link wygasł",
 "sharing is disabled" => "Udostępnianie jest wyłączone",
 "For more info, please ask the person who sent this link." => "Aby uzyskać więcej informacji proszę poprosić osobę, która wysłał ten link.",
-"shared by %s" => "udostępniony przez %s",
+"Download" => "Pobierz",
 "Download %s" => "Pobierz %s",
 "Direct link" => "Bezpośredni link"
 );
diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php
index 4cd95b09dc..7167f99c2d 100644
--- a/apps/files_sharing/l10n/pt_BR.php
+++ b/apps/files_sharing/l10n/pt_BR.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "o link expirou",
 "sharing is disabled" => "compartilhamento está desativada",
 "For more info, please ask the person who sent this link." => "Para mais informações, por favor, pergunte a pessoa que enviou este link.",
-"shared by %s" => "compartilhado por %s",
+"Download" => "Baixar",
 "Download %s" => "Baixar %s",
 "Direct link" => "Link direto"
 );
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
index fdcc498fc2..b28e2b188d 100644
--- a/apps/files_sharing/l10n/pt_PT.php
+++ b/apps/files_sharing/l10n/pt_PT.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "O link expirou",
 "sharing is disabled" => "A partilha está desativada",
 "For more info, please ask the person who sent this link." => "Para mais informações, por favor questione a pessoa que lhe enviou este link",
-"shared by %s" => "partilhada por %s",
+"Download" => "Transferir",
 "Download %s" => "Download %s",
 "Direct link" => "Link direto"
 );
diff --git a/apps/files_sharing/l10n/ro.php b/apps/files_sharing/l10n/ro.php
index ca0d5e077b..024011bf29 100644
--- a/apps/files_sharing/l10n/ro.php
+++ b/apps/files_sharing/l10n/ro.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Parola este incorectă. Încercaţi din nou.",
-"Password" => "Parolă"
+"Password" => "Parolă",
+"Download" => "Descarcă"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php
index 2b44e29a34..5920d79d9e 100644
--- a/apps/files_sharing/l10n/ru.php
+++ b/apps/files_sharing/l10n/ru.php
@@ -10,7 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "срок ссылки истёк",
 "sharing is disabled" => "общий доступ отключён",
 "For more info, please ask the person who sent this link." => "Пожалуйста, обратитесь к отправителю данной ссылки.",
-"shared by %s" => "Поделиться с %s",
+"Download" => "Скачать",
+"Download %s" => "Скачать %s",
 "Direct link" => "Прямая ссылка"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/si_LK.php b/apps/files_sharing/l10n/si_LK.php
index 5d3c0d0bed..da0390033a 100644
--- a/apps/files_sharing/l10n/si_LK.php
+++ b/apps/files_sharing/l10n/si_LK.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "මුර පදය"
+"Password" => "මුර පදය",
+"Download" => "බාන්න"
 );
 $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 6856c0591f..48054b6c7a 100644
--- a/apps/files_sharing/l10n/sk_SK.php
+++ b/apps/files_sharing/l10n/sk_SK.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "linke vypršala platnosť",
 "sharing is disabled" => "zdieľanie je zakázané",
 "For more info, please ask the person who sent this link." => "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz.",
-"shared by %s" => "Zdieľa %s",
+"Download" => "Sťahovanie",
 "Download %s" => "Stiahnuť %s",
 "Direct link" => "Priama linka"
 );
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index 7c1014b0ef..361f2f1b04 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -10,7 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "povezava je pretekla,",
 "sharing is disabled" => "souporaba je onemogočena.",
 "For more info, please ask the person who sent this link." => "Za več podrobnosti stopite v stik s pošiljateljem te povezave.",
-"shared by %s" => "souporabp omogoča %s",
+"Download" => "Prejmi",
 "Download %s" => "Prejmi %s",
 "Direct link" => "Neposredna povezava"
 );
diff --git a/apps/files_sharing/l10n/sq.php b/apps/files_sharing/l10n/sq.php
index b1db4d5c54..f6729dafc3 100644
--- a/apps/files_sharing/l10n/sq.php
+++ b/apps/files_sharing/l10n/sq.php
@@ -9,6 +9,7 @@ $TRANSLATIONS = array(
 "the link expired" => "lidhja ka skaduar",
 "sharing is disabled" => "ndarja është çaktivizuar",
 "For more info, please ask the person who sent this link." => "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje.",
+"Download" => "Shkarko",
 "Direct link" => "Lidhje direkte"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
index bc963ac87b..947e57551a 100644
--- a/apps/files_sharing/l10n/sr.php
+++ b/apps/files_sharing/l10n/sr.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Лозинка"
+"Password" => "Лозинка",
+"Download" => "Преузми"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/sr@latin.php b/apps/files_sharing/l10n/sr@latin.php
index 7d5ba12c6e..f44821fc0d 100644
--- a/apps/files_sharing/l10n/sr@latin.php
+++ b/apps/files_sharing/l10n/sr@latin.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Lozinka"
+"Password" => "Lozinka",
+"Download" => "Preuzmi"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index 94b7edf697..a1951401d7 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -10,7 +10,7 @@ $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" => "Ladda ner",
 "Download %s" => "Ladda ner %s",
 "Direct link" => "Direkt länk"
 );
diff --git a/apps/files_sharing/l10n/ta_LK.php b/apps/files_sharing/l10n/ta_LK.php
index 3b944d42e6..05443e0522 100644
--- a/apps/files_sharing/l10n/ta_LK.php
+++ b/apps/files_sharing/l10n/ta_LK.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Shared by {owner}" => "பகிரப்பட்டது {சொந்தகாரர்}",
-"Password" => "கடவுச்சொல்"
+"Password" => "கடவுச்சொல்",
+"Download" => "பதிவிறக்குக"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
index 706d0a561e..f2f90088da 100644
--- a/apps/files_sharing/l10n/th_TH.php
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Shared by {owner}" => "ถูกแชร์โดย {owner}",
-"Password" => "รหัสผ่าน"
+"Password" => "รหัสผ่าน",
+"Download" => "ดาวน์โหลด"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/tr.php b/apps/files_sharing/l10n/tr.php
index 4177221e10..ac3cb52656 100644
--- a/apps/files_sharing/l10n/tr.php
+++ b/apps/files_sharing/l10n/tr.php
@@ -4,13 +4,13 @@ $TRANSLATIONS = array(
 "This share is password-protected" => "Bu paylaşım parola korumalı",
 "The password is wrong. Try again." => "Parola hatalı. Yeniden deneyin.",
 "Password" => "Parola",
-"Sorry, this link doesn’t seem to work anymore." => "Üzgünüz, bu bağlantı artık çalışıyor gibi görünmüyor",
+"Sorry, this link doesn’t seem to work anymore." => "Üzgünüz, bu bağlantı artık çalışıyor gibi görünmüyor.",
 "Reasons might be:" => "Sebepleri şunlar olabilir:",
 "the item was removed" => "öge kaldırılmış",
 "the link expired" => "bağlantı süresi dolmuş",
 "sharing is disabled" => "paylaşım devre dışı",
 "For more info, please ask the person who sent this link." => "Daha fazla bilgi için bu bağlantıyı aldığınız kişi ile iletişime geçin.",
-"shared by %s" => "paylaşan: %s",
+"Download" => "İndir",
 "Download %s" => "İndir: %s",
 "Direct link" => "Doğrudan bağlantı"
 );
diff --git a/apps/files_sharing/l10n/ug.php b/apps/files_sharing/l10n/ug.php
index 9de4178691..fd6a1c71c9 100644
--- a/apps/files_sharing/l10n/ug.php
+++ b/apps/files_sharing/l10n/ug.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "ئىم"
+"Password" => "ئىم",
+"Download" => "چۈشۈر"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php
index 204b8e174a..7b0acb661b 100644
--- a/apps/files_sharing/l10n/uk.php
+++ b/apps/files_sharing/l10n/uk.php
@@ -10,6 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "посилання застаріло",
 "sharing is disabled" => "обмін заборонений",
 "For more info, please ask the person who sent this link." => "Для отримання додаткової інформації, будь ласка, зверніться до особи, яка надіслала це посилання.",
+"Download" => "Завантажити",
 "Direct link" => "Пряме посилання"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/vi.php b/apps/files_sharing/l10n/vi.php
index e1a65f2751..1db740c023 100644
--- a/apps/files_sharing/l10n/vi.php
+++ b/apps/files_sharing/l10n/vi.php
@@ -2,6 +2,6 @@
 $TRANSLATIONS = array(
 "Shared by {owner}" => "Được chia sẽ bởi {owner}",
 "Password" => "Mật khẩu",
-"shared by %s" => " Được chia sẻ bởi %s"
+"Download" => "Tải về"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_CN.php b/apps/files_sharing/l10n/zh_CN.php
index 8946741a30..5cc95b71af 100644
--- a/apps/files_sharing/l10n/zh_CN.php
+++ b/apps/files_sharing/l10n/zh_CN.php
@@ -10,7 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "链接过期",
 "sharing is disabled" => "共享已禁用",
 "For more info, please ask the person who sent this link." => "欲知详情，请联系发给你链接的人。",
-"shared by %s" => "由 %s 共享",
+"Download" => "下载",
+"Download %s" => "下载 %s",
 "Direct link" => "直接链接"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_HK.php b/apps/files_sharing/l10n/zh_HK.php
index 5904309749..3c561acce4 100644
--- a/apps/files_sharing/l10n/zh_HK.php
+++ b/apps/files_sharing/l10n/zh_HK.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "密碼"
+"Password" => "密碼",
+"Download" => "下載"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index eb591fa359..07abcb6999 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -9,6 +9,7 @@ $TRANSLATIONS = array(
 "the item was removed" => "項目已經移除",
 "the link expired" => "連結過期",
 "sharing is disabled" => "分享功能已停用",
-"For more info, please ask the person who sent this link." => "請詢問告訴您此連結的人以瞭解更多"
+"For more info, please ask the person who sent this link." => "請詢問告訴您此連結的人以瞭解更多",
+"Download" => "下載"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/lib/api.php b/apps/files_sharing/lib/api.php
index 438d3cc4ba..21fd5d00a4 100644
--- a/apps/files_sharing/lib/api.php
+++ b/apps/files_sharing/lib/api.php
@@ -25,7 +25,7 @@ namespace OCA\Files\Share;
 class Api {
 
 	/**
-	 * @brief get all shares
+	 * get all shares
 	 *
 	 * @param array $params option 'file' to limit the result to a specific file/folder
 	 * @return \OC_OCS_Result share information
@@ -60,7 +60,7 @@ class Api {
 	}
 
 	/**
-	 * @brief get share information for a given share
+	 * get share information for a given share
 	 *
 	 * @param array $params which contains a 'id'
 	 * @return \OC_OCS_Result share information
@@ -76,7 +76,7 @@ class Api {
 	}
 
 	/**
-	 * @brief collect all share information, either of a specific share or all
+	 * collect all share information, either of a specific share or all
 	 *        shares for a given path
 	 * @param array $params
 	 * @return \OC_OCS_Result
@@ -130,7 +130,7 @@ class Api {
 	}
 
 	/**
-	 * @brief add reshares to a array of shares
+	 * add reshares to a array of shares
 	 * @param array $shares array of shares
 	 * @param int $itemSource item source ID
 	 * @return array new shares array which includes reshares
@@ -161,7 +161,7 @@ class Api {
 	}
 
 	/**
-	 * @brief get share from all files in a given folder (non-recursive)
+	 * get share from all files in a given folder (non-recursive)
 	 * @param array $params contains 'path' to the folder
 	 * @return \OC_OCS_Result
 	 */
@@ -196,7 +196,7 @@ class Api {
 	}
 
 	/**
-	 * @breif create a new share
+	 * create a new share
 	 * @param array $params
 	 * @return \OC_OCS_Result
 	 */
@@ -313,7 +313,7 @@ class Api {
 	}
 
 	/**
-	 * @brief update permissions for a share
+	 * update permissions for a share
 	 * @param array $share information about the share
 	 * @param array $params contains 'permissions'
 	 * @return \OC_OCS_Result
@@ -358,7 +358,7 @@ class Api {
 	}
 
 	/**
-	 * @brief enable/disable public upload
+	 * enable/disable public upload
 	 * @param array $share information about the share
 	 * @param array $params contains 'publicUpload' which can be 'yes' or 'no'
 	 * @return \OC_OCS_Result
@@ -384,9 +384,9 @@ class Api {
 	}
 
 	/**
-	 * @brief update password for public link share
+	 * update password for public link share
 	 * @param array $share information about the share
-	 * @param type $params 'password'
+	 * @param array $params 'password'
 	 * @return \OC_OCS_Result
 	 */
 	private static function updatePassword($share, $params) {
@@ -418,13 +418,18 @@ class Api {
 			return  new \OC_OCS_Result(null, 404, "share doesn't exists, can't change password");
 		}
 
-		$result = \OCP\Share::shareItem(
-				$itemType,
-				$itemSource,
-				\OCP\Share::SHARE_TYPE_LINK,
-				$shareWith,
-				$permissions
-				);
+		try {
+			$result = \OCP\Share::shareItem(
+					$itemType,
+					$itemSource,
+					\OCP\Share::SHARE_TYPE_LINK,
+					$shareWith,
+					$permissions
+					);
+		} catch (\Exception $e) {
+			return new \OC_OCS_Result(null, 403, $e->getMessage());
+		}
+
 		if($result) {
 			return new \OC_OCS_Result();
 		}
@@ -433,7 +438,7 @@ class Api {
 	}
 
 	/**
-	 * @brief unshare a file/folder
+	 * unshare a file/folder
 	 * @param array $params contains the shareID 'id' which should be unshared
 	 * @return \OC_OCS_Result
 	 */
@@ -473,7 +478,7 @@ class Api {
 	}
 
 	/**
-	 * @brief get file ID from a given path
+	 * get file ID from a given path
 	 * @param string $path
 	 * @return string fileID or null
 	 */
@@ -490,7 +495,7 @@ class Api {
 	}
 
 	/**
-	 * @brief get itemType
+	 * get itemType
 	 * @param string $path
 	 * @return string type 'file', 'folder' or null of file/folder doesn't exists
 	 */
@@ -508,7 +513,7 @@ class Api {
 	}
 
 	/**
-	 * @brief get some information from a given share
+	 * get some information from a given share
 	 * @param int $shareID
 	 * @return array with: item_source, share_type, share_with, item_type, permissions
 	 */
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 8c680e9c97..9d83ed13b8 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -42,7 +42,7 @@ class Shared_Cache extends Cache {
 	}
 
 	/**
-	 * @brief Get the source cache of a shared file or folder
+	 * Get the source cache of a shared file or folder
 	 * @param string $target Shared target file path
 	 * @return \OC\Files\Cache\Cache
 	 */
@@ -54,7 +54,7 @@ class Shared_Cache extends Cache {
 		if (isset($source['path']) && isset($source['fileOwner'])) {
 			\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
 			$mounts = \OC\Files\Filesystem::getMountByNumericId($source['storage']);
-			if (is_array($mounts) and count($mounts)) {
+			if (is_array($mounts) and !empty($mounts)) {
 				$fullPath = $mounts[0]->getMountPoint() . $source['path'];
 				list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($fullPath);
 				if ($storage) {
@@ -80,12 +80,13 @@ 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) {
 		if (is_string($file)) {
-			if ($cache = $this->getSourceCache($file)) {
+			$cache = $this->getSourceCache($file);
+			if ($cache) {
 				$data = $cache->get($this->files[$file]);
 				$data['displayname_owner'] = \OC_User::getDisplayName($this->storage->getSharedFrom());
 				$data['path'] = $file;
@@ -96,16 +97,17 @@ class Shared_Cache extends Cache {
 				return $data;
 			}
 		} else {
+			$sourceId = $file;
 			// if we are at the root of the mount point we want to return the
 			// cache information for the source item
-			if (!is_int($file) || $file === 0) {
-				$file = $this->storage->getSourceId();
+			if (!is_int($sourceId) || $sourceId === 0) {
+				$sourceId = $this->storage->getSourceId();
 			}
 			$query = \OC_DB::prepare(
 				'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`,'
 				. ' `size`, `mtime`, `encrypted`, `unencrypted_size`, `storage_mtime`, `etag`'
 				. ' FROM `*PREFIX*filecache` WHERE `fileid` = ?');
-			$result = $query->execute(array($file));
+			$result = $query->execute(array($sourceId));
 			$data = $result->fetchRow();
 			$data['fileid'] = (int)$data['fileid'];
 			$data['mtime'] = (int)$data['mtime'];
@@ -124,6 +126,7 @@ class Shared_Cache extends Cache {
 			}
 			if (!is_int($file) || $file === 0) {
 				$data['path'] = '';
+				$data['name'] = basename($this->storage->getMountPoint());
 				$data['is_share_mount_point'] = true;
 			}
 			return $data;
@@ -421,7 +424,7 @@ class Shared_Cache extends Cache {
 	 *
 	 * @param int $id
 	 * @param string $pathEnd (optional) used internally for recursive calls
-	 * @return string | null
+	 * @return string|null
 	 */
 	public function getPathById($id, $pathEnd = '') {
 		// direct shares are easy
@@ -439,6 +442,9 @@ class Shared_Cache extends Cache {
 		}
 	}
 
+	/**
+	 * @param integer $id
+	 */
 	private function getShareById($id) {
 		$item = \OCP\Share::getItemSharedWithBySource('file', $id);
 		if ($item) {
@@ -451,6 +457,9 @@ class Shared_Cache extends Cache {
 		return null;
 	}
 
+	/**
+	 * @param integer $id
+	 */
 	private function getParentInfo($id) {
 		$sql = 'SELECT `parent`, `name` FROM `*PREFIX*filecache` WHERE `fileid` = ?';
 		$query = \OC_DB::prepare($sql);
diff --git a/apps/files_sharing/lib/connector/publicauth.php b/apps/files_sharing/lib/connector/publicauth.php
new file mode 100644
index 0000000000..0831129ce7
--- /dev/null
+++ b/apps/files_sharing/lib/connector/publicauth.php
@@ -0,0 +1,71 @@
+<?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 OCA\Files_Sharing\Connector;
+
+class PublicAuth extends \Sabre_DAV_Auth_Backend_AbstractBasic {
+
+	/**
+	 * @var \OCP\IConfig
+	 */
+	private $config;
+
+	private $share;
+
+	/**
+	 * @param \OCP\IConfig $config
+	 */
+	public function __construct($config) {
+		$this->config = $config;
+	}
+
+	/**
+	 * Validates a username and password
+	 *
+	 * This method should return true or false depending on if login
+	 * succeeded.
+	 *
+	 * @param string $username
+	 * @param string $password
+	 *
+	 * @return bool
+	 */
+	protected function validateUserPass($username, $password) {
+		$linkItem = \OCP\Share::getShareByToken($username, false);
+		$this->share = $linkItem;
+		if (!$linkItem) {
+			return false;
+		}
+
+		// check if the share is password protected
+		if (isset($linkItem['share_with'])) {
+			if ($linkItem['share_type'] == \OCP\Share::SHARE_TYPE_LINK) {
+				// Check Password
+				$forcePortable = (CRYPT_BLOWFISH != 1);
+				$hasher = new \PasswordHash(8, $forcePortable);
+				if (!$hasher->CheckPassword($password . $this->config->getSystemValue('passwordsalt', ''), $linkItem['share_with'])) {
+					return false;
+				} else {
+					return true;
+				}
+			} else {
+				return false;
+			}
+		} else {
+			return true;
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getShare() {
+		return $this->share;
+	}
+}
diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php
index cc1f7d9ffd..71b496ab94 100644
--- a/apps/files_sharing/lib/helper.php
+++ b/apps/files_sharing/lib/helper.php
@@ -79,7 +79,7 @@ class Helper {
 	 * @param array $linkItem link item array
 	 * @param string $password optional password
 	 *
-	 * @return true if authorized, false otherwise
+	 * @return boolean true if authorized, false otherwise
 	 */
 	public static function authenticate($linkItem, $password) {
 		if ($password !== null) {
@@ -125,9 +125,13 @@ class Helper {
 
 
 		$ids = array();
-		while ($path !== '' && $path !== '.' && $path !== '/') {
+		while ($path !== dirname($path)) {
 			$info = $ownerView->getFileInfo($path);
-			$ids[] = $info['fileid'];
+			if ($info instanceof \OC\Files\FileInfo) {
+				$ids[] = $info['fileid'];
+			} else {
+				\OCP\Util::writeLog('sharing', 'No fileinfo available for: ' . $path, \OCP\Util::WARN);
+			}
 			$path = dirname($path);
 		}
 
@@ -158,7 +162,7 @@ class Helper {
 	}
 
 	/**
-	 * @brief Format a path to be relative to the /user/files/ directory
+	 * Format a path to be relative to the /user/files/ directory
 	 * @param string $path the absolute path
 	 * @return string e.g. turns '/admin/files/test.txt' into 'test.txt'
 	 */
diff --git a/apps/files_sharing/lib/maintainer.php b/apps/files_sharing/lib/maintainer.php
index bbb3268410..f07c09e5ae 100644
--- a/apps/files_sharing/lib/maintainer.php
+++ b/apps/files_sharing/lib/maintainer.php
@@ -33,7 +33,7 @@ class Maintainer {
 	 * Keeps track of the "allow links" config setting
 	 * and removes all link shares if the config option is set to "no"
 	 *
-	 * @param array with app, key, value as named values
+	 * @param array $params array with app, key, value as named values
 	 */
 	static public function configChangeHook($params) {
 		if($params['app'] === 'core' && $params['key'] === 'shareapi_allow_links' && $params['value'] === 'no') {
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index c0c9e0c107..af71786b10 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -33,10 +33,12 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 	private $path;
 
 	public function isValidSource($itemSource, $uidOwner) {
-		$query = \OC_DB::prepare('SELECT `name` FROM `*PREFIX*filecache` WHERE `fileid` = ?');
-		$result = $query->execute(array($itemSource));
-		if ($row = $result->fetchRow()) {
-			$this->path = $row['name'];
+		$path = \OC\Files\Filesystem::getPath($itemSource);
+		if ($path) {
+			// FIXME: attributes should not be set here,
+			// keeping this pattern for now to avoid unexpected
+			// regressions
+			$this->path = basename($path);
 			return true;
 		}
 		return false;
@@ -52,7 +54,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 	}
 
 	/**
-	 * @brief create unique target
+	 * create unique target
 	 * @param string $filePath
 	 * @param string $shareWith
 	 * @param string $exclude
@@ -152,7 +154,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 	}
 
 	/**
-	 * @brief resolve reshares to return the correct source item
+	 * resolve reshares to return the correct source item
 	 * @param array $source
 	 * @return array source item
 	 */
@@ -181,8 +183,13 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 		return $source;
 	}
 
+	/**
+	 * @param string $target
+	 * @param string $mountPoint
+	 * @param string $itemType
+	 * @return array|false source item
+	 */
 	public static function getSource($target, $mountPoint, $itemType) {
-
 		if ($itemType === 'folder') {
 			$source = \OCP\Share::getItemSharedWith('folder', $mountPoint, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
 			if ($source && $target !== '') {
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 5e478d5ead..4b69276d05 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -36,7 +36,7 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * @breif get id of the mount point
+	 * get id of the mount point
 	 * @return string
 	 */
 	public function getId() {
@@ -44,7 +44,7 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * @breif get file cache of the shared item source
+	 * get file cache of the shared item source
 	 * @return string
 	 */
 	public function getSourceId() {
@@ -52,9 +52,8 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * @brief Get the source file path, permissions, and owner for a shared file
-	 * @param string Shared target file path
-	 * @param string $target
+	 * Get the source file path, permissions, and owner for a shared file
+	 * @param string $target Shared target file path
 	 * @return Returns array with the keys path, permissions, and owner or false if not found
 	 */
 	public function getFile($target) {
@@ -76,9 +75,8 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * @brief Get the source file path for a shared file
-	 * @param string Shared target file path
-	 * @param string $target
+	 * Get the source file path for a shared file
+	 * @param string $target Shared target file path
 	 * @return string source file path or false if not found
 	 */
 	public function getSourcePath($target) {
@@ -87,10 +85,11 @@ class Shared extends \OC\Files\Storage\Common {
 			if (!isset($source['fullPath'])) {
 				\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
 				$mount = \OC\Files\Filesystem::getMountByNumericId($source['storage']);
-				if (is_array($mount)) {
+				if (is_array($mount) && !empty($mount)) {
 					$this->files[$target]['fullPath'] = $mount[key($mount)]->getMountPoint() . $source['path'];
 				} else {
 					$this->files[$target]['fullPath'] = false;
+					\OCP\Util::writeLog('files_sharing', "Unable to get mount for shared storage '" . $source['storage'] . "' user '" . $source['fileOwner'] . "'", \OCP\Util::ERROR);
 				}
 			}
 			return $this->files[$target]['fullPath'];
@@ -99,16 +98,17 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * @brief Get the permissions granted for a shared file
-	 * @param string Shared target file path
-	 * @return int CRUDS permissions granted or false if not found
+	 * Get the permissions granted for a shared file
+	 * @param string $target Shared target file path
+	 * @return int CRUDS permissions granted
 	 */
 	public function getPermissions($target) {
-		$source = $this->getFile($target);
-		if ($source) {
-			return $source['permissions'];
+		$permissions = $this->share['permissions'];
+		// part file are always have delete permissions
+		if (pathinfo($target, PATHINFO_EXTENSION) === 'part') {
+			$permissions |= \OCP\PERMISSION_DELETE;
 		}
-		return false;
+		return $permissions;
 	}
 
 	public function mkdir($path) {
@@ -182,9 +182,6 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	public function isCreatable($path) {
-		if ($path == '') {
-			$path = $this->getMountPoint();
-		}
 		return ($this->getPermissions($path) & \OCP\PERMISSION_CREATE);
 	}
 
@@ -193,23 +190,14 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	public function isUpdatable($path) {
-		if ($path == '') {
-			$path = $this->getMountPoint();
-		}
 		return ($this->getPermissions($path) & \OCP\PERMISSION_UPDATE);
 	}
 
 	public function isDeletable($path) {
-		if ($path == '') {
-			$path = $this->getMountPoint();
-		}
 		return ($this->getPermissions($path) & \OCP\PERMISSION_DELETE);
 	}
 
 	public function isSharable($path) {
-		if ($path == '') {
-			$path = $this->getMountPoint();
-		}
 		return ($this->getPermissions($path) & \OCP\PERMISSION_SHARE);
 	}
 
@@ -275,7 +263,7 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * @brief Format a path to be relative to the /user/files/ directory
+	 * Format a path to be relative to the /user/files/ directory
 	 * @param string $path the absolute path
 	 * @return string e.g. turns '/admin/files/test.txt' into '/test.txt'
 	 */
@@ -299,7 +287,7 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * @brief rename a shared folder/file
+	 * rename a shared folder/file
 	 * @param string $sourcePath
 	 * @param string $targetPath
 	 * @return bool
@@ -378,7 +366,15 @@ class Shared extends \OC\Files\Storage\Common {
 				// otherwise DELETE and CREATE permissions required
 				($this->isDeletable($path1) && $this->isCreatable(dirname($path2)))) {
 
-			list($user1, $path1) = \OCA\Files_Sharing\Helper::getUidAndFilename($relPath1);
+			$pathinfo = pathinfo($relPath1);
+			// for part files we need to ask for the owner and path from the parent directory because
+			// the file cache doesn't return any results for part files
+			if ($pathinfo['extension'] === 'part') {
+				list($user1, $path1) = \OCA\Files_Sharing\Helper::getUidAndFilename($pathinfo['dirname']);
+				$path1 = $path1 . '/' . $pathinfo['basename'];
+			} else {
+				list($user1, $path1) = \OCA\Files_Sharing\Helper::getUidAndFilename($relPath1);
+			}
 			$targetFilename = basename($relPath2);
 			list($user2, $path2) = \OCA\Files_Sharing\Helper::getUidAndFilename(dirname($relPath2));
 			$rootView = new \OC\Files\View('');
@@ -445,9 +441,6 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	public function free_space($path) {
-		if ($path == '') {
-			$path = $this->getMountPoint();
-		}
 		$source = $this->getSourcePath($path);
 		if ($source) {
 			list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($source);
@@ -488,7 +481,7 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * @brief return mount point of share, relative to data/user/files
+	 * return mount point of share, relative to data/user/files
 	 * @return string
 	 */
 	public function getMountPoint() {
@@ -496,7 +489,7 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * @brief get share type
+	 * get share type
 	 * @return integer can be single user share (0) group share (1), unique group share name (2)
 	 */
 	private function getShareType() {
@@ -508,7 +501,7 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * @brief does the group share already has a user specific unique name
+	 * does the group share already has a user specific unique name
 	 * @return bool
 	 */
 	private function uniqueNameSet() {
@@ -516,14 +509,14 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * @brief the share now uses a unique name of this user
+	 * the share now uses a unique name of this user
 	 */
 	private function setUniqueName() {
 		$this->share['unique_name'] = true;
 	}
 
 	/**
-	 * @brief get share ID
+	 * get share ID
 	 * @return integer unique share ID
 	 */
 	private function getShareId() {
@@ -531,7 +524,7 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * @brief get the user who shared the file
+	 * get the user who shared the file
 	 * @return string
 	 */
 	public function getSharedFrom() {
@@ -539,7 +532,7 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * @brief return share type, can be "file" or "folder"
+	 * return share type, can be "file" or "folder"
 	 * @return string
 	 */
 	public function getItemType() {
diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php
index f7c0a75aee..21d67caad9 100644
--- a/apps/files_sharing/lib/updater.php
+++ b/apps/files_sharing/lib/updater.php
@@ -27,7 +27,7 @@ class Shared_Updater {
 	static private $toRemove = array();
 
 	/**
-	 * @brief walk up the users file tree and update the etags
+	 * walk up the users file tree and update the etags
 	 * @param string $user
 	 * @param string $path
 	 */
@@ -38,14 +38,13 @@ class Shared_Updater {
 		\OC\Files\Filesystem::initMountPoints($user);
 		$view = new \OC\Files\View('/' . $user);
 		if ($view->file_exists($path)) {
-			while ($path !== '/') {
+			while ($path !== dirname($path)) {
 				$etag = $view->getETag($path);
 				$view->putFileInfo($path, array('etag' => $etag));
 				$path = dirname($path);
 			}
 		} else {
-			error_log("error!" . 'can not update etags on ' . $path . ' for user ' . $user);
-			\OCP\Util::writeLog('files_sharing', 'can not update etags on ' . $path . ' for user ' . $user, \OCP\Util::ERROR);
+			\OCP\Util::writeLog('files_sharing', 'can not update etags on ' . $path . ' for user ' . $user . '. Path does not exists', \OCP\Util::DEBUG);
 		}
 	}
 
@@ -55,6 +54,12 @@ class Shared_Updater {
 	* @param string $target
 	*/
 	static public function correctFolders($target) {
+
+		// ignore part files
+		if (pathinfo($target, PATHINFO_EXTENSION) === 'part') {
+			return false;
+		}
+
 		// Correct Shared folders of other users shared with
 		$shares = \OCA\Files_Sharing\Helper::getSharesFromItem($target);
 
@@ -73,7 +78,7 @@ class Shared_Updater {
 	}
 
 	/**
-	 * @brief remove all shares for a given file if the file was deleted
+	 * remove all shares for a given file if the file was deleted
 	 *
 	 * @param string $path
 	 */
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index ce51eca6dd..8a86cb3806 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -138,6 +138,7 @@ if (isset($path)) {
 
 			OCP\Util::addStyle('files', 'files');
 			OCP\Util::addStyle('files', 'upload');
+			OCP\Util::addScript('files', 'filesummary');
 			OCP\Util::addScript('files', 'breadcrumb');
 			OCP\Util::addScript('files', 'files');
 			OCP\Util::addScript('files', 'filelist');
@@ -148,11 +149,11 @@ if (isset($path)) {
 
 			$freeSpace=OCP\Util::freeSpace($path);
 			$uploadLimit=OCP\Util::uploadLimit();
-			$folder = new OCP\Template('files', 'index', '');
+			$folder = new OCP\Template('files', 'list', '');
 			$folder->assign('dir', $getPath);
 			$folder->assign('dirToken', $linkItem['token']);
 			$folder->assign('permissions', OCP\PERMISSION_READ);
-			$folder->assign('isPublic',true);
+			$folder->assign('isPublic', true);
 			$folder->assign('publicUploadEnabled', 'no');
 			$folder->assign('files', $files);
 			$folder->assign('uploadMaxFilesize', $maxUploadFilesize);
@@ -161,15 +162,15 @@ 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('disableSharing', true);
 			$folder->assign('trash', false);
 			$tmpl->assign('folder', $folder->fetchPage());
-			$maxInputFileSize = OCP\Config::getSystemValue('maxZipInputSize', OCP\Util::computerFileSize('800 MB'));
 			$allowZip = OCP\Config::getSystemValue('allowZipDownload', true);
 			$tmpl->assign('allowZipDownload', intval($allowZip));
+			$tmpl->assign('showDownloadButton', intval($allowZip));
 			$tmpl->assign('downloadURL',
 				OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath));
 		} else {
+			$tmpl->assign('showDownloadButton', true);
 			$tmpl->assign('dir', $dir);
 
 			// Show file preview if viewer is available
diff --git a/apps/files_sharing/publicwebdav.php b/apps/files_sharing/publicwebdav.php
new file mode 100644
index 0000000000..954c3a3144
--- /dev/null
+++ b/apps/files_sharing/publicwebdav.php
@@ -0,0 +1,58 @@
+<?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.
+ */
+
+// load needed apps
+$RUNTIME_APPTYPES = array('filesystem', 'authentication', 'logging');
+
+OC_App::loadApps($RUNTIME_APPTYPES);
+
+OC_Util::obEnd();
+
+// Backends
+$authBackend = new OCA\Files_Sharing\Connector\PublicAuth(\OC::$server->getConfig());
+$lockBackend = new OC_Connector_Sabre_Locks();
+$requestBackend = new OC_Connector_Sabre_Request();
+
+// Fire up server
+$objectTree = new \OC\Connector\Sabre\ObjectTree();
+$server = new OC_Connector_Sabre_Server($objectTree);
+$server->httpRequest = $requestBackend;
+$server->setBaseUri($baseuri);
+
+// Load plugins
+$defaults = new OC_Defaults();
+$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, $defaults->getName()));
+$server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
+$server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
+$server->addPlugin(new OC_Connector_Sabre_FilesPlugin());
+$server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin());
+$server->addPlugin(new OC_Connector_Sabre_ExceptionLoggerPlugin('webdav'));
+
+// wait with registering these until auth is handled and the filesystem is setup
+$server->subscribeEvent('beforeMethod', function () use ($server, $objectTree, $authBackend) {
+	$share = $authBackend->getShare();
+	$owner = $share['uid_owner'];
+	$fileId = $share['file_source'];
+	OC_Util::setupFS($owner);
+	$ownerView = \OC\Files\Filesystem::getView();
+	$path = $ownerView->getPath($fileId);
+
+
+	$view = new \OC\Files\View($ownerView->getAbsolutePath($path));
+	$rootInfo = $view->getFileInfo('');
+
+	// Create ownCloud Dir
+	$rootDir = new OC_Connector_Sabre_Directory($view, $rootInfo);
+	$objectTree->init($rootDir, $view);
+
+	$server->addPlugin(new OC_Connector_Sabre_AbortedUploadDetectionPlugin($view));
+	$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin($view));
+}, 30); // priority 30: after auth (10) and acl(20), before lock(50) and handling the request
+
+// And off we go!
+$server->exec();
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index fc8d59e1e8..9471752b6b 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -1,3 +1,4 @@
+<?php /** @var $l OC_L10N */ ?>
 <div id="notification-container">
 	<div id="notification" style="display: none;"></div>
 </div>
@@ -14,7 +15,12 @@
 		                                                                                          src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a>
 		<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 		<div class="header-right">
-			<span id="details"><?php p($l->t('shared by %s', array($_['displayName']))) ?></span>
+			<?php if ($_['showDownloadButton']): ?>
+			<a href="<?php p($_['downloadURL']); ?>" id="download" class="button">
+				<img class="svg" alt="" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"/>
+				<?php p($l->t('Download'))?>
+			</a>
+			<?php endif ?>
 		</div>
 </div></header>
 <div id="content">
@@ -24,7 +30,6 @@
 		<?php else: ?>
 			<?php if (substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'image'): ?>
 				<div id="imgframe">
-					<img src="<?php p($_['downloadURL']); ?>" />
 				</div>
 			<?php elseif (substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?>
 				<div id="imgframe">
@@ -35,7 +40,10 @@
 			<?php else: ?>
 				<div id="imgframe">
 					<?php $size = \OC\Preview::isMimeSupported($_['mimetype']) ? 500 : 128 ?>
-					<img src="<?php p(OCP\Util::linkToRoute( 'core_ajax_public_preview', array('x' => $size, 'y' => $size, 'file' => $_['directory_path'], 't' => $_['dirToken']))); ?>" class="publicpreview"/>
+					<img
+						src="<?php p(OCP\Util::linkToRoute( 'core_ajax_public_preview', array('x' => $size, 'y' => $size, 'file' => $_['directory_path'], 't' => $_['dirToken']))); ?>"
+						class="publicpreview"
+						alt="" />
 				</div>
 			<?php endif; ?>
 			<div class="directDownload">
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index b2f05d10ac..dc07c6fc62 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -29,10 +29,14 @@ use OCA\Files\Share;
  */
 class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 
+	const TEST_FOLDER_NAME = '/folder_share_api_test';
+
+	private static $tempStorage;
+
 	function setUp() {
 		parent::setUp();
 
-		$this->folder = '/folder_share_api_test';
+		$this->folder = self::TEST_FOLDER_NAME;
 		$this->subfolder  = '/subfolder_share_api_test';
 		$this->subsubfolder = '/subsubfolder_share_api_test';
 
@@ -51,6 +55,8 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 		$this->view->unlink($this->filename);
 		$this->view->deleteAll($this->folder);
 
+		self::$tempStorage = null;
+
 		parent::tearDown();
 	}
 
@@ -107,11 +113,65 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 		$fileinfo = $this->view->getFileInfo($this->folder);
 
 		\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
-
-
-
 	}
 
+	function testEnfoceLinkPassword() {
+
+		$appConfig = \OC::$server->getAppConfig();
+		$appConfig->setValue('core', 'shareapi_enforce_links_password', 'yes');
+
+		// don't allow to share link without a password
+		$_POST['path'] = $this->folder;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+
+
+		$result = Share\Api::createShare(array());
+		$this->assertFalse($result->succeeded());
+
+
+		// don't allow to share link without a empty password
+		$_POST['path'] = $this->folder;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+		$_POST['password'] = '';
+
+		$result = Share\Api::createShare(array());
+		$this->assertFalse($result->succeeded());
+
+		// share with password should succeed
+		$_POST['path'] = $this->folder;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+		$_POST['password'] = 'foo';
+
+		$result = Share\Api::createShare(array());
+		$this->assertTrue($result->succeeded());
+
+		$data = $result->getData();
+
+		// setting new password should succeed
+		$params = array();
+		$params['id'] = $data['id'];
+		$params['_put'] = array();
+		$params['_put']['password'] = 'bar';
+
+		$result = Share\Api::updateShare($params);
+		$this->assertTrue($result->succeeded());
+
+		// removing password should fail
+		$params = array();
+		$params['id'] = $data['id'];
+		$params['_put'] = array();
+		$params['_put']['password'] = '';
+
+		$result = Share\Api::updateShare($params);
+		$this->assertFalse($result->succeeded());
+
+		// cleanup
+		$fileinfo = $this->view->getFileInfo($this->folder);
+		\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+		$appConfig->setValue('core', 'shareapi_enforce_links_password', 'no');
+	}
+
+
 	/**
 	 * @medium
 	 * @depends testCreateShare
@@ -127,7 +187,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 
 		$this->assertTrue($result->succeeded());
 
-        // test should return two shares created from testCreateShare()
+		// test should return two shares created from testCreateShare()
 		$this->assertTrue(count($result->getData()) === 1);
 
 		\OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
@@ -154,7 +214,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 
 		$this->assertTrue($result->succeeded());
 
-        // test should return one share created from testCreateShare()
+		// test should return one share created from testCreateShare()
 		$this->assertTrue(count($result->getData()) === 2);
 
 		\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
@@ -281,7 +341,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 
 		$this->assertTrue($result->succeeded());
 
-        // test should return one share within $this->folder
+		// test should return one share within $this->folder
 		$this->assertTrue(count($result->getData()) === 1);
 
 		\OCP\Share::unshare('file', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER,
@@ -292,7 +352,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 	}
 
 	/**
-	 * @brief share a folder, than reshare a file within the shared folder and check if we construct the correct path
+	 * share a folder, than reshare a file within the shared folder and check if we construct the correct path
 	 * @medium
 	 */
 	function testGetShareFromFolderReshares() {
@@ -357,7 +417,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 	}
 
 	/**
-	 * @brief reshare a sub folder and check if we get the correct path
+	 * reshare a sub folder and check if we get the correct path
 	 * @medium
 	 */
 	function testGetShareFromSubFolderReShares() {
@@ -410,7 +470,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 	}
 
 	/**
-	 * @brief test re-re-share of folder if the path gets constructed correctly
+	 * test re-re-share of folder if the path gets constructed correctly
 	 * @medium
 	 */
 	function testGetShareFromFolderReReShares() {
@@ -478,7 +538,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 	}
 
 	/**
-	 * @brief test multiple shared folder if the path gets constructed correctly
+	 * test multiple shared folder if the path gets constructed correctly
 	 * @medium
 	 */
 	function testGetShareMultipleSharedFolder() {
@@ -561,7 +621,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 	}
 
 	/**
-	 * @brief test re-re-share of folder if the path gets constructed correctly
+	 * test re-re-share of folder if the path gets constructed correctly
 	 * @medium
 	 */
 	function testGetShareFromFileReReShares() {
@@ -638,7 +698,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 		$result = Share\Api::getShare($params);
 
 		$this->assertEquals(404, $result->getStatusCode());
-        $meta = $result->getMeta();
+		$meta = $result->getMeta();
 		$this->assertEquals('share doesn\'t exist', $meta['message']);
 
 	}
@@ -695,7 +755,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 
 		$result = Share\Api::updateShare($params);
 
-        $meta = $result->getMeta();
+		$meta = $result->getMeta();
 		$this->assertTrue($result->succeeded(), $meta['message']);
 
 		$items = \OCP\Share::getItemShared('file', $userShare['file_source']);
@@ -835,7 +895,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 	}
 
 	/**
-	 * @brief test unshare of a reshared file
+	 * test unshare of a reshared file
 	 */
 	function testDeleteReshare() {
 
@@ -879,7 +939,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 	}
 
 	/**
-	 * @brief share a folder which contains a share mount point, should be forbidden
+	 * share a folder which contains a share mount point, should be forbidden
 	 */
 	public function testShareFolderWithAMountPoint() {
 		// user 1 shares a folder with user2
@@ -928,6 +988,54 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
 	}
 
+	/**
+	 * Post init mount points hook for mounting simulated ext storage
+	 */
+	public static function initTestMountPointsHook($data) {
+		if ($data['user'] === \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1) {
+			\OC\Files\Filesystem::mount(self::$tempStorage, array(), '/' . \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1 . '/files' . self::TEST_FOLDER_NAME);
+		}
+	}
+
+	/**
+	 * Tests mounting a folder that is an external storage mount point.
+	 */
+	public function testShareStorageMountPoint() {
+		self::$tempStorage = new \OC\Files\Storage\Temporary(array());
+		self::$tempStorage->file_put_contents('test.txt', 'abcdef');
+		self::$tempStorage->getScanner()->scan('');
+
+		// needed because the sharing code sometimes switches the user internally and mounts the user's
+		// storages. In our case the temp storage isn't mounted automatically, so doing it in the post hook
+		// (similar to how ext storage works)
+		OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\Test_Files_Sharing_Api', 'initTestMountPointsHook');
+
+		// logging in will auto-mount the temp storage for user1 as well
+		\Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
+
+		$fileInfo = $this->view->getFileInfo($this->folder);
+
+		// user 1 shares the mount point folder with user2
+		$result = \OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
+
+		$this->assertTrue($result);
+
+		// user2: check that mount point name appears correctly
+		\Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+
+		$view = new \OC\Files\View('/' . \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2 . '/files');
+
+		$this->assertTrue($view->file_exists($this->folder));
+		$this->assertTrue($view->file_exists($this->folder . '/test.txt'));
+
+		\Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
+
+		\OCP\Share::unshare('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+			\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+
+		\OC_Hook::clear('OC_Filesystem', 'post_initMountPoints', '\Test_Files_Sharing_Api', 'initTestMountPointsHook');
+	}
 	/**
 	 * @expectedException \Exception
 	 */
@@ -951,4 +1059,57 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 		\OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_LINK, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
 	}
 
+	public function testDefaultExpireDate() {
+		\Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
+		\OC_Appconfig::setValue('core', 'shareapi_default_expire_date', 'yes');
+		\OC_Appconfig::setValue('core', 'shareapi_enforce_expire_date', 'yes');
+		\OC_Appconfig::setValue('core', 'shareapi_expire_after_n_days', '2');
+
+		// default expire date is set to 2 days
+		// the time when the share was created is set to 3 days in the past
+		// user defined expire date is set to +2 days from now on
+		// -> link should be already expired by the default expire date but the user
+		//    share should still exists.
+		$now = time();
+		$dateFormat = 'Y-m-d H:i:s';
+		$shareCreated = $now - 3 * 24 * 60 * 60;
+		$expireDate = date($dateFormat, $now + 2 * 24 * 60 * 60);
+
+		$info = OC\Files\Filesystem::getFileInfo($this->filename);
+		$this->assertTrue($info instanceof \OC\Files\FileInfo);
+
+		$result = \OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_LINK, null, \OCP\PERMISSION_READ);
+		$this->assertTrue(is_string($result));
+
+		$result = \OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_USER, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
+		$this->assertTrue($result);
+
+		$result = \OCP\Share::setExpirationDate('file', $info->getId() , $expireDate);
+		$this->assertTrue($result);
+
+		//manipulate stime so that both shares are older then the default expire date
+		$statement = "UPDATE `*PREFIX*share` SET `stime` = ? WHERE `share_type` = ?";
+		$query = \OCP\DB::prepare($statement);
+		$result = $query->execute(array($shareCreated, \OCP\Share::SHARE_TYPE_LINK));
+		$this->assertSame(1, $result);
+		$statement = "UPDATE `*PREFIX*share` SET `stime` = ? WHERE `share_type` = ?";
+		$query = \OCP\DB::prepare($statement);
+		$result = $query->execute(array($shareCreated, \OCP\Share::SHARE_TYPE_USER));
+		$this->assertSame(1, $result);
+
+		// now the link share should expire because of enforced default expire date
+		// the user share should still exist
+		$result = \OCP\Share::getItemShared('file', $info->getId());
+		$this->assertTrue(is_array($result));
+		$this->assertSame(1, count($result));
+		$share = reset($result);
+		$this->assertSame(\OCP\Share::SHARE_TYPE_USER, $share['share_type']);
+
+		//cleanup
+		$result = \OCP\Share::unshare('file', $info->getId(), \OCP\Share::SHARE_TYPE_USER, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+		$this->assertTrue($result);
+		\OC_Appconfig::setValue('core', 'shareapi_default_expire_date', 'no');
+		\OC_Appconfig::setValue('core', 'shareapi_enforce_expire_date', 'no');
+
+	}
 }
diff --git a/apps/files_sharing/tests/base.php b/apps/files_sharing/tests/base.php
index 495dca072c..7cd36b9d41 100644
--- a/apps/files_sharing/tests/base.php
+++ b/apps/files_sharing/tests/base.php
@@ -39,7 +39,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
 	public $filename;
 	public $data;
 	/**
-	 * @var OC_FilesystemView
+	 * @var OC\Files\View
 	 */
 	public $view;
 	public $folder;
@@ -68,7 +68,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
 
 		$this->data = 'foobar';
-		$this->view = new \OC_FilesystemView('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
+		$this->view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
 		// remember files_encryption state
 		$this->stateFilesEncryption = \OC_App::isEnabled('files_encryption');
 
@@ -97,7 +97,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @param $user
+	 * @param string $user
 	 * @param bool $create
 	 * @param bool $password
 	 */
@@ -119,7 +119,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @brief get some information from a given share
+	 * get some information from a given share
 	 * @param int $shareID
 	 * @return array with: item_source, share_type, share_with, item_type, permissions
 	 */
diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
index 1af73c558d..c5408ba55e 100644
--- a/apps/files_sharing/tests/cache.php
+++ b/apps/files_sharing/tests/cache.php
@@ -25,7 +25,7 @@ require_once __DIR__ . '/base.php';
 class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
 
 	/**
-	 * @var OC_FilesystemView
+	 * @var OC\Files\View
 	 */
 	public $user2View;
 
@@ -230,7 +230,7 @@ class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
 	}
 
 	/**
-	 * @brief verify if each value from the result matches the expected result
+	 * verify if each value from the result matches the expected result
 	 * @param array $example array with the expected results
 	 * @param array $result array with the results
 	 */
diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php
new file mode 100644
index 0000000000..66518a2633
--- /dev/null
+++ b/apps/files_sharing/tests/sharedstorage.php
@@ -0,0 +1,83 @@
+<?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/>.
+ *
+ */
+
+require_once __DIR__ . '/base.php';
+
+use OCA\Files\Share;
+
+/**
+ * Class Test_Files_Sharing_Api
+ */
+class Test_Files_Sharing_Storage extends Test_Files_Sharing_Base {
+
+	function setUp() {
+		parent::setUp();
+
+		$this->folder = '/folder_share_storage_test';
+
+		$this->filename = '/share-api-storage.txt';
+
+		// save file with content
+		$this->view->mkdir($this->folder);
+	}
+
+	function tearDown() {
+		$this->view->deleteAll($this->folder);
+
+		parent::tearDown();
+	}
+
+	/**
+	 * @medium
+	 */
+	function testRenamePartFile() {
+
+		// share to user
+		$fileinfo = $this->view->getFileInfo($this->folder);
+		$result = \OCP\Share::shareItem('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+			self::TEST_FILES_SHARING_API_USER2, 31);
+
+		$this->assertTrue($result);
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+		$user2View = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
+
+		$this->assertTrue($user2View->file_exists($this->folder));
+
+		// create part file
+		$result = $user2View->file_put_contents($this->folder. '/foo.txt.part', 'some test data');
+
+		$this->assertTrue(is_int($result));
+		// rename part file to real file
+		$result = $user2View->rename($this->folder. '/foo.txt.part', $this->folder. '/foo.txt');
+
+		$this->assertTrue($result);
+
+		// check if the new file really exists
+		$this->assertTrue($user2View->file_exists( $this->folder. '/foo.txt'));
+
+		// check if the rename also affected the owner
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+
+		$this->assertTrue($this->view->file_exists( $this->folder. '/foo.txt'));
+	}
+}
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php
index 89a5511452..e1f52e814b 100644
--- a/apps/files_trashbin/ajax/list.php
+++ b/apps/files_trashbin/ajax/list.php
@@ -4,11 +4,13 @@ OCP\JSON::checkLoggedIn();
 
 // Load the files
 $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
+$sortAttribute = isset( $_GET['sort'] ) ? $_GET['sort'] : 'name';
+$sortDirection = isset( $_GET['sortdirection'] ) ? ($_GET['sortdirection'] === 'desc') : false;
 $data = array();
 
 // make filelist
 try {
-	$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
+	$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, $sortAttribute, $sortDirection);
 } catch (Exception $e) {
 	header("HTTP/1.0 404 Not Found");
 	exit();
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index d30a601ef5..b8900ee0de 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -1,7 +1,15 @@
 <?php
-
-//OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
-//OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
+$l = OC_L10N::get('files_trashbin');
 
 // register hooks
 \OCA\Files_Trashbin\Trashbin::registerHooks();
+
+\OCA\Files\App::getNavigationManager()->add(
+array(
+	"id" => 'trashbin',
+	"appname" => 'files_trashbin',
+	"script" => 'list.php',
+	"order" => 1,
+	"name" => $l->t('Deleted files')
+)
+);
diff --git a/apps/files_trashbin/appinfo/routes.php b/apps/files_trashbin/appinfo/routes.php
index b1c3f02741..42398a06c8 100644
--- a/apps/files_trashbin/appinfo/routes.php
+++ b/apps/files_trashbin/appinfo/routes.php
@@ -1,5 +1,6 @@
 <?php
-$this->create('core_ajax_trashbin_preview', '/preview.png')->action(
+/** @var $this \OCP\Route\IRouter */
+$this->create('core_ajax_trashbin_preview', '/preview')->action(
 function() {
 	require_once __DIR__ . '/../ajax/preview.php';
-});
\ No newline at end of file
+});
diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css
index 7ca3e355fc..04b4a175c8 100644
--- a/apps/files_trashbin/css/trash.css
+++ b/apps/files_trashbin/css/trash.css
@@ -1,4 +1,13 @@
-#fileList tr[data-type="file"] td a.name,
-#fileList tr[data-type="file"] td a.name span {
+/*
+ * Copyright (c) 2014
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+#app-content-trashbin tbody tr[data-type="file"] td a.name,
+#app-content-trashbin tbody tr[data-type="file"] td a.name span {
     cursor: default;
 }
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
deleted file mode 100644
index e63fe1e418..0000000000
--- a/apps/files_trashbin/index.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-// Check if we are a user
-OCP\User::checkLoggedIn();
-
-OCP\App::setActiveNavigationEntry('files_index');
-
-OCP\Util::addScript('files_trashbin', 'disableDefaultActions');
-OCP\Util::addScript('files', 'fileactions');
-$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');
-OCP\Util::addscript('files', 'files');
-OCP\Util::addScript('files_trashbin', 'trash');
-
-$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
-
-$isIE8 = false;
-preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
-if (count($matches) > 0 && $matches[1] <= 8){
-	$isIE8 = true;
-}
-
-// if IE8 and "?dir=path" was specified, reformat the URL to use a hash like "#?dir=path"
-if ($isIE8 && isset($_GET['dir'])){
-	if ($dir === ''){
-		$dir = '/';
-	}
-	header('Location: ' . OCP\Util::linkTo('files_trashbin', 'index.php') . '#?dir=' . \OCP\Util::encodePath($dir));
-	exit();
-}
-
-$tmpl->assign('dir', $dir);
-$tmpl->assign('disableSharing', true);
-
-$tmpl->printPage();
diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js
new file mode 100644
index 0000000000..aa499ae179
--- /dev/null
+++ b/apps/files_trashbin/js/app.js
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2014
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+OCA.Trashbin = {};
+OCA.Trashbin.App = {
+	_initialized: false,
+
+	initialize: function($el) {
+		if (this._initialized) {
+			return;
+		}
+		this._initialized = true;
+		this.fileList = new OCA.Trashbin.FileList(
+			$('#app-content-trashbin'), {
+				scrollContainer: $('#app-content')
+			}
+		);
+		this.registerFileActions(this.fileList);
+	},
+
+	registerFileActions: function(fileList) {
+		var self = this;
+		var fileActions = _.extend({}, OCA.Files.FileActions);
+		fileActions.clear();
+		fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
+			var dir = fileList.getCurrentDirectory();
+			if (dir !== '/') {
+				dir = dir + '/';
+			}
+			fileList.changeDirectory(dir + filename);
+		});
+
+		fileActions.setDefault('dir', 'Open');
+
+		fileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename) {
+			var tr = fileList.findFileEl(filename);
+			var deleteAction = tr.children("td.date").children(".action.delete");
+			deleteAction.removeClass('delete-icon').addClass('progress-icon');
+			fileList.disableActions();
+			$.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'), {
+					files: JSON.stringify([filename]),
+					dir: fileList.getCurrentDirectory()
+				},
+				_.bind(fileList._removeCallback, fileList)
+			);
+		}, t('files_trashbin', 'Restore'));
+
+		fileActions.register('all', 'Delete', OC.PERMISSION_READ, function() {
+			return OC.imagePath('core', 'actions/delete');
+		}, function(filename) {
+			$('.tipsy').remove();
+			var tr = fileList.findFileEl(filename);
+			var deleteAction = tr.children("td.date").children(".action.delete");
+			deleteAction.removeClass('delete-icon').addClass('progress-icon');
+			fileList.disableActions();
+			$.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'), {
+					files: JSON.stringify([filename]),
+					dir: fileList.getCurrentDirectory()
+				},
+				_.bind(fileList._removeCallback, fileList)
+			);
+		});
+		fileList.setFileActions(fileActions);
+	}
+};
+
+$(document).ready(function() {
+	$('#app-content-trashbin').one('show', function() {
+		var App = OCA.Trashbin.App;
+		App.initialize($('#app-content-trashbin'));
+		// force breadcrumb init
+		// App.fileList.changeDirectory(App.fileList.getCurrentDirectory(), false, true);
+	});
+});
+
diff --git a/apps/files_trashbin/js/disableDefaultActions.js b/apps/files_trashbin/js/disableDefaultActions.js
deleted file mode 100644
index 50ceaf4696..0000000000
--- a/apps/files_trashbin/js/disableDefaultActions.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/* disable download and sharing actions */
-var disableDownloadActions = true;
-var trashBinApp = true;
diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js
index 7795daf277..205f879f33 100644
--- a/apps/files_trashbin/js/filelist.js
+++ b/apps/files_trashbin/js/filelist.js
@@ -1,8 +1,14 @@
-/* global OC, t, FileList */
+/*
+ * Copyright (c) 2014
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
 (function() {
-	FileList.appName = t('files_trashbin', 'Deleted files');
-
-	FileList._deletedRegExp = new RegExp(/^(.+)\.d[0-9]+$/);
+	var DELETED_REGEXP = new RegExp(/^(.+)\.d[0-9]+$/);
 
 	/**
 	 * Convert a file name in the format filename.d12345 to the real file name.
@@ -11,68 +17,248 @@
 	 * @param name file name
 	 * @return converted file name
 	 */
-	FileList.getDeletedFileName = function(name) {
+	function getDeletedFileName(name) {
 		name = OC.basename(name);
-		var match = FileList._deletedRegExp.exec(name);
+		var match = DELETED_REGEXP.exec(name);
 		if (match && match.length > 1) {
 			name = match[1];
 		}
 		return name;
+	}
+
+	var FileList = function($el) {
+		this.initialize($el);
 	};
+	FileList.prototype = _.extend({}, OCA.Files.FileList.prototype, {
+		id: 'trashbin',
+		appName: t('files_trashbin', 'Deleted files'),
 
-	var oldSetCurrentDir = FileList._setCurrentDir;
-	FileList._setCurrentDir = function(targetDir) {
-		oldSetCurrentDir.apply(this, arguments);
+		initialize: function() {
+			var result = OCA.Files.FileList.prototype.initialize.apply(this, arguments);
+			this.$el.find('.undelete').click('click', _.bind(this._onClickRestoreSelected, this));
 
-		var baseDir = OC.basename(targetDir);
-		if (baseDir !== '') {
-			FileList.setPageTitle(FileList.getDeletedFileName(baseDir));
+			this.setSort('mtime', 'desc');
+			/**
+			 * Override crumb making to add "Deleted Files" entry
+			 * and convert files with ".d" extensions to a more
+			 * user friendly name.
+			 */
+			this.breadcrumb._makeCrumbs = function() {
+				var parts = OCA.Files.BreadCrumb.prototype._makeCrumbs.apply(this, arguments);
+				for (var i = 1; i < parts.length; i++) {
+					parts[i].name = getDeletedFileName(parts[i].name);
+				}
+				return parts;
+			};
+
+			return result;
+		},
+
+		/**
+		 * Override to only return read permissions
+		 */
+		getDirectoryPermissions: function() {
+			return OC.PERMISSION_READ | OC.PERMISSION_DELETE;
+		},
+
+		_setCurrentDir: function(targetDir) {
+			OCA.Files.FileList.prototype._setCurrentDir.apply(this, arguments);
+
+			var baseDir = OC.basename(targetDir);
+			if (baseDir !== '') {
+				this.setPageTitle(getDeletedFileName(baseDir));
+			}
+		},
+
+		_createRow: function() {
+			// FIXME: MEGAHACK until we find a better solution
+			var tr = OCA.Files.FileList.prototype._createRow.apply(this, arguments);
+			tr.find('td.filesize').remove();
+			return tr;
+		},
+
+		_renderRow: function(fileData, options) {
+			options = options || {};
+			var dir = this.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 OCA.Files.FileList.prototype._renderRow.call(this, fileData, options);
+		},
+
+		getAjaxUrl: function(action, params) {
+			var q = '';
+			if (params) {
+				q = '?' + OC.buildQueryString(params);
+			}
+			return OC.filePath('files_trashbin', 'ajax', action + '.php') + q;
+		},
+
+		setupUploadEvents: function() {
+			// override and do nothing
+		},
+
+		linkTo: function(dir){
+			return OC.linkTo('files', 'index.php')+"?view=trashbin&dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
+		},
+
+		updateEmptyContent: function(){
+			var exists = this.$fileList.find('tr:first').exists();
+			this.$el.find('#emptycontent').toggleClass('hidden', exists);
+			this.$el.find('#filestable th').toggleClass('hidden', !exists);
+		},
+
+		_removeCallback: function(result) {
+			if (result.status !== 'success') {
+				OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error'));
+			}
+
+			var files = result.data.success;
+			var $el;
+			for (var i = 0; i < files.length; i++) {
+				$el = this.remove(OC.basename(files[i].filename), {updateSummary: false});
+				this.fileSummary.remove({type: $el.attr('data-type'), size: $el.attr('data-size')});
+			}
+			this.fileSummary.update();
+			this.updateEmptyContent();
+			this.enableActions();
+		},
+
+		_onClickRestoreSelected: function(event) {
+			event.preventDefault();
+			var self = this;
+			var allFiles = this.$el.find('.select-all').is(':checked');
+			var files = [];
+			var params = {};
+			this.disableActions();
+			if (allFiles) {
+				this.showMask();
+				params = {
+					allfiles: true,
+					dir: this.getCurrentDirectory()
+				};
+			}
+			else {
+				files = _.pluck(this.getSelectedFiles(), 'name');
+				for (var i = 0; i < files.length; i++) {
+					var deleteAction = this.findFileEl(files[i]).children("td.date").children(".action.delete");
+					deleteAction.removeClass('delete-icon').addClass('progress-icon');
+				}
+				params = {
+					files: JSON.stringify(files),
+					dir: this.getCurrentDirectory()
+				};
+			}
+
+			$.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'),
+				params,
+				function(result) {
+					if (allFiles) {
+						if (result.status !== 'success') {
+							OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error'));
+						}
+						self.hideMask();
+						// simply remove all files
+						self.setFiles([]);
+						self.enableActions();
+					}
+					else {
+						self._removeCallback(result);
+					}
+				}
+			);
+		},
+
+		_onClickDeleteSelected: function(event) {
+			event.preventDefault();
+			var self = this;
+			var allFiles = this.$el.find('.select-all').is(':checked');
+			var files = [];
+			var params = {};
+			if (allFiles) {
+				params = {
+					allfiles: true,
+					dir: this.getCurrentDirectory()
+				};
+			}
+			else {
+				files = _.pluck(this.getSelectedFiles(), 'name');
+				params = {
+					files: JSON.stringify(files),
+					dir: this.getCurrentDirectory()
+				};
+			}
+
+			this.disableActions();
+			if (allFiles) {
+				this.showMask();
+			}
+			else {
+				for (var i = 0; i < files.length; i++) {
+					var deleteAction = this.findFileEl(files[i]).children("td.date").children(".action.delete");
+					deleteAction.removeClass('delete-icon').addClass('progress-icon');
+				}
+			}
+
+			$.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'),
+					params,
+					function(result) {
+						if (allFiles) {
+							if (result.status !== 'success') {
+								OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error'));
+							}
+							self.hideMask();
+							// simply remove all files
+							self.setFiles([]);
+							self.enableActions();
+						}
+						else {
+							self._removeCallback(result);
+						}
+					}
+			);
+		},
+
+		_onClickFile: function(event) {
+			var mime = $(this).parent().parent().data('mime');
+			if (mime !== 'httpd/unix-directory') {
+				event.preventDefault();
+			}
+			return OCA.Files.FileList.prototype._onClickFile.apply(this, arguments);
+		},
+
+		generatePreviewUrl: function(urlSpec) {
+			return OC.generateUrl('/apps/files_trashbin/ajax/preview.php?') + $.param(urlSpec);
+		},
+
+		getDownloadUrl: function() {
+			// no downloads
+			return '#';
+		},
+
+		enableActions: function() {
+			this.$el.find('.action').css('display', 'inline');
+			this.$el.find(':input:checkbox').css('display', 'inline');
+		},
+
+		disableActions: function() {
+			this.$el.find('.action').css('display', 'none');
+			this.$el.find(':input:checkbox').css('display', 'none');
+		},
+
+		updateStorageStatistics: function() {
+			// no op because the trashbin doesn't have
+			// storage info like free space / used space
 		}
-	};
 
-	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);
-	};
+	OCA.Trashbin.FileList = FileList;
 })();
+
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
deleted file mode 100644
index f7724d07d2..0000000000
--- a/apps/files_trashbin/js/trash.js
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright (c) 2014
- *
- * This file is licensed under the Affero General Public License version 3
- * or later.
- *
- * See the COPYING-README file.
- *
- */
-
-/* global OC, 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('files_trashbin', 'Error'));
-		}
-
-		var files = result.data.success;
-		for (var i = 0; i < files.length; i++) {
-			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);
-			var deleteAction = tr.children("td.date").children(".action.delete");
-			deleteAction.removeClass('delete-icon').addClass('progress-icon');
-			disableActions();
-			$.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'), {
-					files: JSON.stringify([filename]),
-					dir: FileList.getCurrentDirectory()
-				},
-			    removeCallback
-			);
-		}, t('files_trashbin', 'Restore'));
-	};
-
-	FileActions.register('all', 'Delete', OC.PERMISSION_READ, function() {
-		return OC.imagePath('core', 'actions/delete');
-	}, function(filename) {
-		$('.tipsy').remove();
-		var tr = FileList.findFileEl(filename);
-		var deleteAction = tr.children("td.date").children(".action.delete");
-		deleteAction.removeClass('delete-icon').addClass('progress-icon');
-		disableActions();
-		$.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'), {
-				files: JSON.stringify([filename]),
-				dir: FileList.getCurrentDirectory()
-			},
-			removeCallback
-		);
-	});
-
-	// Sets the select_all checkbox behaviour :
-	$('#select_all').click(function() {
-		if ($(this).attr('checked')) {
-			// Check all
-			$('td.filename input:checkbox').attr('checked', true);
-			$('td.filename input:checkbox').parent().parent().addClass('selected');
-		} else {
-			// Uncheck all
-			$('td.filename input:checkbox').attr('checked', false);
-			$('td.filename input:checkbox').parent().parent().removeClass('selected');
-		}
-		procesSelection();
-	});
-	$('.undelete').click('click', function(event) {
-		event.preventDefault();
-		var allFiles = $('#select_all').is(':checked');
-		var files = [];
-		var params = {};
-		disableActions();
-		if (allFiles) {
-			FileList.showMask();
-			params = {
-				allfiles: true,
-				dir: FileList.getCurrentDirectory()
-			};
-		}
-		else {
-			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');
-			}
-			params = {
-				files: JSON.stringify(files),
-				dir: FileList.getCurrentDirectory()
-			};
-		}
-
-		$.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'),
-			params,
-			function(result) {
-				if (allFiles) {
-					if (result.status !== 'success') {
-						OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error'));
-					}
-					FileList.hideMask();
-					// simply remove all files
-					FileList.update('');
-					enableActions();
-				}
-				else {
-					removeCallback(result);
-				}
-			}
-		);
-	});
-
-	$('.delete').click('click', function(event) {
-		event.preventDefault();
-		var allFiles = $('#select_all').is(':checked');
-		var files = [];
-		var params = {};
-		if (allFiles) {
-			params = {
-				allfiles: true,
-				dir: FileList.getCurrentDirectory()
-			};
-		}
-		else {
-			files = Files.getSelectedFiles('name');
-			params = {
-				files: JSON.stringify(files),
-				dir: FileList.getCurrentDirectory()
-			};
-		}
-
-		disableActions();
-		if (allFiles) {
-			FileList.showMask();
-		}
-		else {
-			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');
-			}
-		}
-
-		$.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'),
-				params,
-				function(result) {
-					if (allFiles) {
-						if (result.status !== 'success') {
-							OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error'));
-						}
-						FileList.hideMask();
-						// simply remove all files
-						FileList.setFiles([]);
-						enableActions();
-					}
-					else {
-						removeCallback(result);
-					}
-				}
-		);
-
-	});
-
-	$('#fileList').on('click', 'td.filename input', function() {
-		var checkbox = $(this).parent().children('input:checkbox');
-		$(checkbox).parent().parent().toggleClass('selected');
-		if ($(checkbox).is(':checked')) {
-			var selectedCount = $('td.filename input:checkbox:checked').length;
-			if (selectedCount === $('td.filename input:checkbox').length) {
-				$('#select_all').prop('checked', true);
-			}
-		} else {
-			$('#select_all').prop('checked',false);
-		}
-		procesSelection();
-	});
-
-	$('#fileList').on('click', 'td.filename a', function(event) {
-		var mime = $(this).parent().parent().data('mime');
-		if (mime !== 'httpd/unix-directory') {
-			event.preventDefault();
-		}
-		var filename = $(this).parent().parent().attr('data-file');
-		var tr = FileList.findFileEl(filename);
-		var renaming = tr.data('renaming');
-		if(!renaming){
-			if(mime.substr(0, 5) === 'text/'){ //no texteditor for now
-				return;
-			}
-			var type = $(this).parent().parent().data('type');
-			var permissions = $(this).parent().parent().data('permissions');
-			var action = FileActions.getDefault(mime, type, permissions);
-			if(action){
-				event.preventDefault();
-				action(filename);
-			}
-		}
-	});
-
-	/**
-	 * 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);
-	};
-
-	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')
-		};
-		for (var i = 2; i < parts.length; i++) {
-			parts[i].name = getDeletedFileName(parts[i].name);
-		}
-		return parts;
-	};
-
-	FileActions.actions.dir = {
-		// only keep 'Open' action for navigation
-		'Open': FileActions.actions.dir.Open
-	};
-});
-
-function enableActions() {
-	$(".action").css("display", "inline");
-	$(":input:checkbox").css("display", "inline");
-}
-
-function disableActions() {
-	$(".action").css("display", "none");
-	$(":input:checkbox").css("display", "none");
-}
-
diff --git a/apps/files_trashbin/l10n/ar.php b/apps/files_trashbin/l10n/ar.php
index b3abc7df86..5a6105bda6 100644
--- a/apps/files_trashbin/l10n/ar.php
+++ b/apps/files_trashbin/l10n/ar.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "تعذّر حذف%s بشكل دائم",
 "Couldn't restore %s" => "تعذّر استرجاع %s ",
 "Deleted files" => "حذف الملفات",
+"Restore" => "استعيد",
 "Error" => "خطأ",
-"Deleted Files" => "الملفات المحذوفه",
 "restored" => "تمت الاستعادة",
 "Nothing in here. Your trash bin is empty!" => "لا يوجد شيء هنا. سلة المهملات خاليه.",
 "Name" => "اسم",
-"Restore" => "استعيد",
 "Deleted" => "تم الحذف",
 "Delete" => "إلغاء"
 );
diff --git a/apps/files_trashbin/l10n/ast.php b/apps/files_trashbin/l10n/ast.php
index 688e1ce3d8..3240d6751c 100644
--- a/apps/files_trashbin/l10n/ast.php
+++ b/apps/files_trashbin/l10n/ast.php
@@ -2,11 +2,12 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nun pudo desaniciase %s dafechu",
 "Couldn't restore %s" => "Nun pudo restaurase %s",
+"Deleted files" => "Ficheros desaniciaos",
+"Restore" => "Restaurar",
 "Error" => "Fallu",
-"Deleted Files" => "Ficheros desaniciaos",
+"restored" => "recuperóse",
 "Nothing in here. Your trash bin is empty!" => "Nun hai un res equí. La papelera ta balera!",
 "Name" => "Nome",
-"Restore" => "Restaurar",
 "Deleted" => "Desaniciáu",
 "Delete" => "Desaniciar"
 );
diff --git a/apps/files_trashbin/l10n/bg_BG.php b/apps/files_trashbin/l10n/bg_BG.php
index 8c9e658068..62057538ce 100644
--- a/apps/files_trashbin/l10n/bg_BG.php
+++ b/apps/files_trashbin/l10n/bg_BG.php
@@ -2,11 +2,10 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Невъзможно перманентното изтриване на %s",
 "Couldn't restore %s" => "Невъзможно възтановяване на %s",
+"Restore" => "Възтановяване",
 "Error" => "Грешка",
-"Deleted Files" => "Изтрити файлове",
 "Nothing in here. Your trash bin is empty!" => "Няма нищо. Кофата е празна!",
 "Name" => "Име",
-"Restore" => "Възтановяване",
 "Deleted" => "Изтрито",
 "Delete" => "Изтриване"
 );
diff --git a/apps/files_trashbin/l10n/ca.php b/apps/files_trashbin/l10n/ca.php
index 196d6ac00a..59b42797cf 100644
--- a/apps/files_trashbin/l10n/ca.php
+++ b/apps/files_trashbin/l10n/ca.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "No s'ha pogut esborrar permanentment %s",
 "Couldn't restore %s" => "No s'ha pogut restaurar %s",
 "Deleted files" => "Fitxers esborrats",
+"Restore" => "Recupera",
 "Error" => "Error",
-"Deleted Files" => "Fitxers eliminats",
 "restored" => "restaurat",
 "Nothing in here. Your trash bin is empty!" => "La paperera està buida!",
 "Name" => "Nom",
-"Restore" => "Recupera",
 "Deleted" => "Eliminat",
 "Delete" => "Esborra"
 );
diff --git a/apps/files_trashbin/l10n/cs_CZ.php b/apps/files_trashbin/l10n/cs_CZ.php
index ed795582e4..3e4f9e0e15 100644
--- a/apps/files_trashbin/l10n/cs_CZ.php
+++ b/apps/files_trashbin/l10n/cs_CZ.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nelze trvale odstranit %s",
 "Couldn't restore %s" => "Nelze obnovit %s",
 "Deleted files" => "Odstraněné soubory",
+"Restore" => "Obnovit",
 "Error" => "Chyba",
-"Deleted Files" => "Smazané soubory",
 "restored" => "obnoveno",
 "Nothing in here. Your trash bin is empty!" => "Žádný obsah. Váš koš je prázdný.",
 "Name" => "Název",
-"Restore" => "Obnovit",
 "Deleted" => "Smazáno",
 "Delete" => "Smazat"
 );
diff --git a/apps/files_trashbin/l10n/cy_GB.php b/apps/files_trashbin/l10n/cy_GB.php
index 7b1405777d..4e76a6d25a 100644
--- a/apps/files_trashbin/l10n/cy_GB.php
+++ b/apps/files_trashbin/l10n/cy_GB.php
@@ -3,11 +3,10 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Methwyd dileu %s yn barhaol",
 "Couldn't restore %s" => "Methwyd adfer %s",
 "Deleted files" => "Ffeiliau ddilewyd",
+"Restore" => "Adfer",
 "Error" => "Gwall",
-"Deleted Files" => "Ffeiliau Ddilewyd",
 "Nothing in here. Your trash bin is empty!" => "Does dim byd yma. Mae eich bin sbwriel yn wag!",
 "Name" => "Enw",
-"Restore" => "Adfer",
 "Deleted" => "Wedi dileu",
 "Delete" => "Dileu"
 );
diff --git a/apps/files_trashbin/l10n/da.php b/apps/files_trashbin/l10n/da.php
index 7f7b65bca2..b651d81d1b 100644
--- a/apps/files_trashbin/l10n/da.php
+++ b/apps/files_trashbin/l10n/da.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kunne ikke slette %s permanent",
 "Couldn't restore %s" => "Kunne ikke gendanne %s",
 "Deleted files" => "Slettede filer",
+"Restore" => "Gendan",
 "Error" => "Fejl",
-"Deleted Files" => "Slettede filer",
 "restored" => "Gendannet",
 "Nothing in here. Your trash bin is empty!" => "Intet at se her. Din papirkurv er tom!",
 "Name" => "Navn",
-"Restore" => "Gendan",
 "Deleted" => "Slettet",
 "Delete" => "Slet"
 );
diff --git a/apps/files_trashbin/l10n/de.php b/apps/files_trashbin/l10n/de.php
index 4778e159e1..56b7ccfc7b 100644
--- a/apps/files_trashbin/l10n/de.php
+++ b/apps/files_trashbin/l10n/de.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
 "Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
 "Deleted files" => "Gelöschte Dateien",
+"Restore" => "Wiederherstellen",
 "Error" => "Fehler",
-"Deleted Files" => "Gelöschte Dateien",
 "restored" => "Wiederhergestellt",
 "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, der Papierkorb ist leer!",
 "Name" => "Name",
-"Restore" => "Wiederherstellen",
 "Deleted" => "gelöscht",
 "Delete" => "Löschen"
 );
diff --git a/apps/files_trashbin/l10n/de_CH.php b/apps/files_trashbin/l10n/de_CH.php
index 603d82f5c7..be54e57d3f 100644
--- a/apps/files_trashbin/l10n/de_CH.php
+++ b/apps/files_trashbin/l10n/de_CH.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
 "Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
 "Deleted files" => "Gelöschte Dateien",
+"Restore" => "Wiederherstellen",
 "Error" => "Fehler",
-"Deleted Files" => "Gelöschte Dateien",
 "restored" => "Wiederhergestellt",
 "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!",
 "Name" => "Name",
-"Restore" => "Wiederherstellen",
 "Deleted" => "Gelöscht",
 "Delete" => "Löschen"
 );
diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php
index 603d82f5c7..be54e57d3f 100644
--- a/apps/files_trashbin/l10n/de_DE.php
+++ b/apps/files_trashbin/l10n/de_DE.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
 "Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
 "Deleted files" => "Gelöschte Dateien",
+"Restore" => "Wiederherstellen",
 "Error" => "Fehler",
-"Deleted Files" => "Gelöschte Dateien",
 "restored" => "Wiederhergestellt",
 "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!",
 "Name" => "Name",
-"Restore" => "Wiederherstellen",
 "Deleted" => "Gelöscht",
 "Delete" => "Löschen"
 );
diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php
index 23b23ed93a..c77bfb7fa1 100644
--- a/apps/files_trashbin/l10n/el.php
+++ b/apps/files_trashbin/l10n/el.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Αδύνατη η μόνιμη διαγραφή του %s",
 "Couldn't restore %s" => "Αδυναμία επαναφοράς %s",
 "Deleted files" => "Διαγραμμένα αρχεία",
+"Restore" => "Επαναφορά",
 "Error" => "Σφάλμα",
-"Deleted Files" => "Διαγραμμένα Αρχεία",
 "restored" => "επαναφέρθηκαν",
 "Nothing in here. Your trash bin is empty!" => "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!",
 "Name" => "Όνομα",
-"Restore" => "Επαναφορά",
 "Deleted" => "Διαγραμμένα",
 "Delete" => "Διαγραφή"
 );
diff --git a/apps/files_trashbin/l10n/en_GB.php b/apps/files_trashbin/l10n/en_GB.php
index a660b4b1ca..b2715dfceb 100644
--- a/apps/files_trashbin/l10n/en_GB.php
+++ b/apps/files_trashbin/l10n/en_GB.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Couldn't delete %s permanently",
 "Couldn't restore %s" => "Couldn't restore %s",
 "Deleted files" => "Deleted files",
+"Restore" => "Restore",
 "Error" => "Error",
-"Deleted Files" => "Deleted Files",
 "restored" => "restored",
 "Nothing in here. Your trash bin is empty!" => "Nothing in here. Your recycle bin is empty!",
 "Name" => "Name",
-"Restore" => "Restore",
 "Deleted" => "Deleted",
 "Delete" => "Delete"
 );
diff --git a/apps/files_trashbin/l10n/eo.php b/apps/files_trashbin/l10n/eo.php
index d644f0f642..67617f448d 100644
--- a/apps/files_trashbin/l10n/eo.php
+++ b/apps/files_trashbin/l10n/eo.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Ne povis foriĝi %s por ĉiam",
 "Couldn't restore %s" => "Ne povis restaŭriĝi %s",
 "Deleted files" => "Forigitaj dosieroj",
+"Restore" => "Restaŭri",
 "Error" => "Eraro",
-"Deleted Files" => "Forigitaj dosieroj",
 "restored" => "restaŭrita",
 "Nothing in here. Your trash bin is empty!" => "Nenio estas ĉi tie. Via rubujo malplenas!",
 "Name" => "Nomo",
-"Restore" => "Restaŭri",
 "Deleted" => "Forigita",
 "Delete" => "Forigi"
 );
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index c0dc6bb45c..c3db776515 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "No se puede eliminar %s permanentemente",
 "Couldn't restore %s" => "No se puede restaurar %s",
 "Deleted files" => "Archivos eliminados",
+"Restore" => "Recuperar",
 "Error" => "Error",
-"Deleted Files" => "Archivos Eliminados",
 "restored" => "recuperado",
 "Nothing in here. Your trash bin is empty!" => "No hay nada aquí. ¡Tu papelera esta vacía!",
 "Name" => "Nombre",
-"Restore" => "Recuperar",
 "Deleted" => "Eliminado",
 "Delete" => "Eliminar"
 );
diff --git a/apps/files_trashbin/l10n/es_AR.php b/apps/files_trashbin/l10n/es_AR.php
index b354dd656b..2991ea507b 100644
--- a/apps/files_trashbin/l10n/es_AR.php
+++ b/apps/files_trashbin/l10n/es_AR.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "No fue posible borrar %s de manera permanente",
 "Couldn't restore %s" => "No se pudo restaurar %s",
 "Deleted files" => "Archivos borrados",
+"Restore" => "Recuperar",
 "Error" => "Error",
-"Deleted Files" => "Archivos eliminados",
 "restored" => "recuperado",
 "Nothing in here. Your trash bin is empty!" => "No hay nada acá. ¡La papelera está vacía!",
 "Name" => "Nombre",
-"Restore" => "Recuperar",
 "Deleted" => "Borrado",
 "Delete" => "Borrar"
 );
diff --git a/apps/files_trashbin/l10n/es_MX.php b/apps/files_trashbin/l10n/es_MX.php
index c0dc6bb45c..c3db776515 100644
--- a/apps/files_trashbin/l10n/es_MX.php
+++ b/apps/files_trashbin/l10n/es_MX.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "No se puede eliminar %s permanentemente",
 "Couldn't restore %s" => "No se puede restaurar %s",
 "Deleted files" => "Archivos eliminados",
+"Restore" => "Recuperar",
 "Error" => "Error",
-"Deleted Files" => "Archivos Eliminados",
 "restored" => "recuperado",
 "Nothing in here. Your trash bin is empty!" => "No hay nada aquí. ¡Tu papelera esta vacía!",
 "Name" => "Nombre",
-"Restore" => "Recuperar",
 "Deleted" => "Eliminado",
 "Delete" => "Eliminar"
 );
diff --git a/apps/files_trashbin/l10n/et_EE.php b/apps/files_trashbin/l10n/et_EE.php
index 69d20cb195..c1c9ea66c4 100644
--- a/apps/files_trashbin/l10n/et_EE.php
+++ b/apps/files_trashbin/l10n/et_EE.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s jäädavalt kustutamine ebaõnnestus",
 "Couldn't restore %s" => "%s ei saa taastada",
 "Deleted files" => "Kustutatud failid",
+"Restore" => "Taasta",
 "Error" => "Viga",
-"Deleted Files" => "Kustutatud failid",
 "restored" => "taastatud",
 "Nothing in here. Your trash bin is empty!" => "Siin pole midagi. Sinu prügikast on tühi!",
 "Name" => "Nimi",
-"Restore" => "Taasta",
 "Deleted" => "Kustutatud",
 "Delete" => "Kustuta"
 );
diff --git a/apps/files_trashbin/l10n/eu.php b/apps/files_trashbin/l10n/eu.php
index 42476bccfe..63c1245da0 100644
--- a/apps/files_trashbin/l10n/eu.php
+++ b/apps/files_trashbin/l10n/eu.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Ezin izan da %s betirako ezabatu",
 "Couldn't restore %s" => "Ezin izan da %s berreskuratu",
 "Deleted files" => "Ezabatutako fitxategiak",
+"Restore" => "Berrezarri",
 "Error" => "Errorea",
-"Deleted Files" => "Ezabatutako Fitxategiak",
 "restored" => "Berrezarrita",
 "Nothing in here. Your trash bin is empty!" => "Ez dago ezer ez. Zure zakarrontzia hutsik dago!",
 "Name" => "Izena",
-"Restore" => "Berrezarri",
 "Deleted" => "Ezabatuta",
 "Delete" => "Ezabatu"
 );
diff --git a/apps/files_trashbin/l10n/fa.php b/apps/files_trashbin/l10n/fa.php
index 407524eb62..0823e98ea1 100644
--- a/apps/files_trashbin/l10n/fa.php
+++ b/apps/files_trashbin/l10n/fa.php
@@ -3,11 +3,10 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s را نمی توان برای همیشه حذف کرد",
 "Couldn't restore %s" => "%s را نمی توان بازگرداند",
 "Deleted files" => "فایل های حذف شده",
+"Restore" => "بازیابی",
 "Error" => "خطا",
-"Deleted Files" => "فایلهای حذف شده",
 "Nothing in here. Your trash bin is empty!" => "هیچ چیزی اینجا نیست. سطل زباله ی شما خالی است.",
 "Name" => "نام",
-"Restore" => "بازیابی",
 "Deleted" => "حذف شده",
 "Delete" => "حذف"
 );
diff --git a/apps/files_trashbin/l10n/fi_FI.php b/apps/files_trashbin/l10n/fi_FI.php
index da56baf0bd..158fc7dac5 100644
--- a/apps/files_trashbin/l10n/fi_FI.php
+++ b/apps/files_trashbin/l10n/fi_FI.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kohdetta %s ei voitu poistaa pysyvästi",
 "Couldn't restore %s" => "Kohteen %s palautus epäonnistui",
 "Deleted files" => "Poistetut tiedostot",
+"Restore" => "Palauta",
 "Error" => "Virhe",
-"Deleted Files" => "Poistetut tiedostot",
 "restored" => "palautettu",
 "Nothing in here. Your trash bin is empty!" => "Tyhjää täynnä! Roskakorissa ei ole mitään.",
 "Name" => "Nimi",
-"Restore" => "Palauta",
 "Deleted" => "Poistettu",
 "Delete" => "Poista"
 );
diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php
index b71fbea96a..0e6330bb2d 100644
--- a/apps/files_trashbin/l10n/fr.php
+++ b/apps/files_trashbin/l10n/fr.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Impossible d'effacer %s de façon permanente",
 "Couldn't restore %s" => "Impossible de restaurer %s",
 "Deleted files" => "Fichiers supprimés",
+"Restore" => "Restaurer",
 "Error" => "Erreur",
-"Deleted Files" => "Fichiers effacés",
 "restored" => "restauré",
 "Nothing in here. Your trash bin is empty!" => "Il n'y a rien ici. Votre corbeille est vide !",
 "Name" => "Nom",
-"Restore" => "Restaurer",
 "Deleted" => "Effacé",
 "Delete" => "Supprimer"
 );
diff --git a/apps/files_trashbin/l10n/gl.php b/apps/files_trashbin/l10n/gl.php
index fe74ab34a0..143cf0e6df 100644
--- a/apps/files_trashbin/l10n/gl.php
+++ b/apps/files_trashbin/l10n/gl.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Non foi posíbel eliminar %s permanente",
 "Couldn't restore %s" => "Non foi posíbel restaurar %s",
 "Deleted files" => "Ficheiros eliminados",
+"Restore" => "Restablecer",
 "Error" => "Erro",
-"Deleted Files" => "Ficheiros eliminados",
 "restored" => "restaurado",
 "Nothing in here. Your trash bin is empty!" => "Aquí non hai nada. O cesto do lixo está baleiro!",
 "Name" => "Nome",
-"Restore" => "Restablecer",
 "Deleted" => "Eliminado",
 "Delete" => "Eliminar"
 );
diff --git a/apps/files_trashbin/l10n/he.php b/apps/files_trashbin/l10n/he.php
index 6cdc5c05c9..90b3fd11ab 100644
--- a/apps/files_trashbin/l10n/he.php
+++ b/apps/files_trashbin/l10n/he.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "לא ניתן למחוק את %s לצמיתות",
 "Couldn't restore %s" => "לא ניתן לשחזר את %s",
 "Deleted files" => "קבצים שנמחקו",
+"Restore" => "שחזור",
 "Error" => "שגיאה",
-"Deleted Files" => "קבצים שנמחקו",
 "restored" => "שוחזר",
 "Nothing in here. Your trash bin is empty!" => "אין כאן שום דבר. סל המיחזור שלך ריק!",
 "Name" => "שם",
-"Restore" => "שחזור",
 "Deleted" => "נמחק",
 "Delete" => "מחיקה"
 );
diff --git a/apps/files_trashbin/l10n/hu_HU.php b/apps/files_trashbin/l10n/hu_HU.php
index 2912821d96..60f3ebad85 100644
--- a/apps/files_trashbin/l10n/hu_HU.php
+++ b/apps/files_trashbin/l10n/hu_HU.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nem sikerült %s végleges törlése",
 "Couldn't restore %s" => "Nem sikerült %s visszaállítása",
 "Deleted files" => "Törölt fájlok",
+"Restore" => "Visszaállítás",
 "Error" => "Hiba",
-"Deleted Files" => "Törölt fájlok",
 "restored" => "visszaállítva",
 "Nothing in here. Your trash bin is empty!" => "Itt nincs semmi. Az Ön szemetes mappája üres!",
 "Name" => "Név",
-"Restore" => "Visszaállítás",
 "Deleted" => "Törölve",
 "Delete" => "Törlés"
 );
diff --git a/apps/files_trashbin/l10n/id.php b/apps/files_trashbin/l10n/id.php
index 166b9aa811..bba9e329ee 100644
--- a/apps/files_trashbin/l10n/id.php
+++ b/apps/files_trashbin/l10n/id.php
@@ -3,11 +3,10 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Tidak dapat menghapus permanen %s",
 "Couldn't restore %s" => "Tidak dapat memulihkan %s",
 "Deleted files" => "Berkas yang dihapus",
+"Restore" => "Pulihkan",
 "Error" => "Galat",
-"Deleted Files" => "Berkas yang Dihapus",
 "Nothing in here. Your trash bin is empty!" => "Tempat sampah anda kosong!",
 "Name" => "Nama",
-"Restore" => "Pulihkan",
 "Deleted" => "Dihapus",
 "Delete" => "Hapus"
 );
diff --git a/apps/files_trashbin/l10n/it.php b/apps/files_trashbin/l10n/it.php
index 057305ac51..905384b82b 100644
--- a/apps/files_trashbin/l10n/it.php
+++ b/apps/files_trashbin/l10n/it.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Impossibile eliminare %s definitivamente",
 "Couldn't restore %s" => "Impossibile ripristinare %s",
 "Deleted files" => "File eliminati",
+"Restore" => "Ripristina",
 "Error" => "Errore",
-"Deleted Files" => "File eliminati",
 "restored" => "ripristinati",
 "Nothing in here. Your trash bin is empty!" => "Qui non c'è niente. Il tuo cestino è vuoto.",
 "Name" => "Nome",
-"Restore" => "Ripristina",
 "Deleted" => "Eliminati",
 "Delete" => "Elimina"
 );
diff --git a/apps/files_trashbin/l10n/ja.php b/apps/files_trashbin/l10n/ja.php
index 13ca95e6fb..b24e40aa23 100644
--- a/apps/files_trashbin/l10n/ja.php
+++ b/apps/files_trashbin/l10n/ja.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s を完全に削除できませんでした",
 "Couldn't restore %s" => "%s を復元できませんでした",
 "Deleted files" => "ゴミ箱",
+"Restore" => "復元",
 "Error" => "エラー",
-"Deleted Files" => "ゴミ箱",
 "restored" => "復元済",
 "Nothing in here. Your trash bin is empty!" => "ここには何もありません。ゴミ箱は空です！",
 "Name" => "名前",
-"Restore" => "復元",
 "Deleted" => "削除済み",
 "Delete" => "削除"
 );
diff --git a/apps/files_trashbin/l10n/ka_GE.php b/apps/files_trashbin/l10n/ka_GE.php
index 4e3ad4260e..16e147bd41 100644
--- a/apps/files_trashbin/l10n/ka_GE.php
+++ b/apps/files_trashbin/l10n/ka_GE.php
@@ -3,11 +3,10 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "ფაილი %s–ის სრულად წაშლა ვერ მოხერხდა",
 "Couldn't restore %s" => "%s–ის აღდგენა ვერ მოხერხდა",
 "Deleted files" => "წაშლილი ფაილები",
+"Restore" => "აღდგენა",
 "Error" => "შეცდომა",
-"Deleted Files" => "წაშლილი ფაილები",
 "Nothing in here. Your trash bin is empty!" => "აქ არაფერი არ არის. სანაგვე ყუთი ცარიელია!",
 "Name" => "სახელი",
-"Restore" => "აღდგენა",
 "Deleted" => "წაშლილი",
 "Delete" => "წაშლა"
 );
diff --git a/apps/files_trashbin/l10n/km.php b/apps/files_trashbin/l10n/km.php
index 1df805de2d..40119afc87 100644
--- a/apps/files_trashbin/l10n/km.php
+++ b/apps/files_trashbin/l10n/km.php
@@ -1,8 +1,14 @@
 <?php
 $TRANSLATIONS = array(
-"Error" => "កំហុស",
-"Name" => "ឈ្មោះ",
+"Couldn't delete %s permanently" => "មិន​អាច​លុប %s ចោល​ជា​អចិន្ត្រៃយ៍​ទេ",
+"Couldn't restore %s" => "មិន​អាច​ស្ដារ %s ឡើង​វិញ​បាន​ទេ",
+"Deleted files" => "ឯកសារ​ដែល​បាន​លុប",
 "Restore" => "ស្ដារ​មក​វិញ",
+"Error" => "កំហុស",
+"restored" => "បាន​ស្ដារ​វិញ",
+"Nothing in here. Your trash bin is empty!" => "គ្មាន​អ្វី​នៅ​ទីនេះ​ទេ។ ធុង​សំរាម​របស់​អ្នក​គឺ​ទទេ!",
+"Name" => "ឈ្មោះ",
+"Deleted" => "បាន​លុប",
 "Delete" => "លុប"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ko.php b/apps/files_trashbin/l10n/ko.php
index d9d8707080..98800fd2e5 100644
--- a/apps/files_trashbin/l10n/ko.php
+++ b/apps/files_trashbin/l10n/ko.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s을(를_ 영구적으로 삭제할 수 없습니다",
 "Couldn't restore %s" => "%s을(를) 복원할 수 없습니다",
 "Deleted files" => "삭제된 파일",
+"Restore" => "복원",
 "Error" => "오류",
-"Deleted Files" => "삭제된 파일",
 "restored" => "복원됨",
 "Nothing in here. Your trash bin is empty!" => "휴지통이 비어 있습니다!",
 "Name" => "이름",
-"Restore" => "복원",
 "Deleted" => "삭제됨",
 "Delete" => "삭제"
 );
diff --git a/apps/files_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php
index 2bf545483f..fa65d7eaba 100644
--- a/apps/files_trashbin/l10n/lt_LT.php
+++ b/apps/files_trashbin/l10n/lt_LT.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nepavyko negrįžtamai ištrinti %s",
 "Couldn't restore %s" => "Nepavyko atkurti %s",
 "Deleted files" => "Ištrinti failai",
+"Restore" => "Atstatyti",
 "Error" => "Klaida",
-"Deleted Files" => "Ištrinti failai",
 "restored" => "atstatyta",
 "Nothing in here. Your trash bin is empty!" => "Nieko nėra. Jūsų šiukšliadėžė tuščia!",
 "Name" => "Pavadinimas",
-"Restore" => "Atstatyti",
 "Deleted" => "Ištrinti",
 "Delete" => "Ištrinti"
 );
diff --git a/apps/files_trashbin/l10n/lv.php b/apps/files_trashbin/l10n/lv.php
index c173d05014..3432f9ac75 100644
--- a/apps/files_trashbin/l10n/lv.php
+++ b/apps/files_trashbin/l10n/lv.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nevarēja pilnībā izdzēst %s",
 "Couldn't restore %s" => "Nevarēja atjaunot %s",
 "Deleted files" => "Dzēstās datnes",
+"Restore" => "Atjaunot",
 "Error" => "Kļūda",
-"Deleted Files" => "Dzēstās datnes",
 "restored" => "atjaunots",
 "Nothing in here. Your trash bin is empty!" => "Šeit nekā nav. Jūsu miskaste ir tukša!",
 "Name" => "Nosaukums",
-"Restore" => "Atjaunot",
 "Deleted" => "Dzēsts",
 "Delete" => "Dzēst"
 );
diff --git a/apps/files_trashbin/l10n/mk.php b/apps/files_trashbin/l10n/mk.php
index 910b11e21e..66c2d0a296 100644
--- a/apps/files_trashbin/l10n/mk.php
+++ b/apps/files_trashbin/l10n/mk.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Не можеше трајно да се избрише %s",
 "Couldn't restore %s" => "Не можеше да се поврати %s",
 "Deleted files" => "Избришани датотеки",
+"Restore" => "Поврати",
 "Error" => "Грешка",
-"Deleted Files" => "Избришани датотеки",
 "restored" => "повратени",
 "Nothing in here. Your trash bin is empty!" => "Тука нема ништо. Вашата корпа за отпадоци е празна!",
 "Name" => "Име",
-"Restore" => "Поврати",
 "Deleted" => "Избришан",
 "Delete" => "Избриши"
 );
diff --git a/apps/files_trashbin/l10n/ms_MY.php b/apps/files_trashbin/l10n/ms_MY.php
index f084f58465..fdfd922438 100644
--- a/apps/files_trashbin/l10n/ms_MY.php
+++ b/apps/files_trashbin/l10n/ms_MY.php
@@ -2,12 +2,11 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Tidak dapat menghapuskan %s secara kekal",
 "Couldn't restore %s" => "Tidak dapat memulihkan %s",
+"Restore" => "Pulihkan",
 "Error" => "Ralat",
-"Deleted Files" => "Fail Dihapus",
 "restored" => "dipulihkan",
 "Nothing in here. Your trash bin is empty!" => "Tiada apa disini. Tong sampah anda kosong!",
 "Name" => "Nama",
-"Restore" => "Pulihkan",
 "Deleted" => "Dihapuskan",
 "Delete" => "Padam"
 );
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
index 2293e5a4e7..519b4e5aa2 100644
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ b/apps/files_trashbin/l10n/nb_NO.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kunne ikke slette %s fullstendig",
 "Couldn't restore %s" => "Kunne ikke gjenopprette %s",
 "Deleted files" => "Slettede filer",
+"Restore" => "Gjenopprett",
 "Error" => "Feil",
-"Deleted Files" => "Slettede filer",
 "restored" => "gjenopprettet",
 "Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!",
 "Name" => "Navn",
-"Restore" => "Gjenopprett",
 "Deleted" => "Slettet",
 "Delete" => "Slett"
 );
diff --git a/apps/files_trashbin/l10n/nl.php b/apps/files_trashbin/l10n/nl.php
index c8fb128853..41dfa86b7a 100644
--- a/apps/files_trashbin/l10n/nl.php
+++ b/apps/files_trashbin/l10n/nl.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kon %s niet permanent verwijderen",
 "Couldn't restore %s" => "Kon %s niet herstellen",
 "Deleted files" => "Verwijderde bestanden",
+"Restore" => "Herstellen",
 "Error" => "Fout",
-"Deleted Files" => "Verwijderde bestanden",
 "restored" => "hersteld",
 "Nothing in here. Your trash bin is empty!" => "Niets te vinden. Uw prullenbak is leeg!",
 "Name" => "Naam",
-"Restore" => "Herstellen",
 "Deleted" => "Verwijderd",
 "Delete" => "Verwijder"
 );
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index 38bc64e6ce..aa18927b1f 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Klarte ikkje sletta %s for godt",
 "Couldn't restore %s" => "Klarte ikkje gjenoppretta %s",
 "Deleted files" => "Sletta filer",
+"Restore" => "Gjenopprett",
 "Error" => "Feil",
-"Deleted Files" => "Sletta filer",
 "restored" => "gjenoppretta",
 "Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!",
 "Name" => "Namn",
-"Restore" => "Gjenopprett",
 "Deleted" => "Sletta",
 "Delete" => "Slett"
 );
diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php
index b961efd7da..16bb9dbfa2 100644
--- a/apps/files_trashbin/l10n/pl.php
+++ b/apps/files_trashbin/l10n/pl.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nie można trwale usunąć %s",
 "Couldn't restore %s" => "Nie można przywrócić %s",
 "Deleted files" => "Pliki usunięte",
+"Restore" => "Przywróć",
 "Error" => "Błąd",
-"Deleted Files" => "Usunięte pliki",
 "restored" => "przywrócony",
 "Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!",
 "Name" => "Nazwa",
-"Restore" => "Przywróć",
 "Deleted" => "Usunięte",
 "Delete" => "Usuń"
 );
diff --git a/apps/files_trashbin/l10n/pt_BR.php b/apps/files_trashbin/l10n/pt_BR.php
index d524d8879e..b7dd346b40 100644
--- a/apps/files_trashbin/l10n/pt_BR.php
+++ b/apps/files_trashbin/l10n/pt_BR.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Não foi possível excluir %s permanentemente",
 "Couldn't restore %s" => "Não foi possível restaurar %s",
 "Deleted files" => "Arquivos apagados",
+"Restore" => "Restaurar",
 "Error" => "Erro",
-"Deleted Files" => "Arquivos Apagados",
 "restored" => "restaurado",
 "Nothing in here. Your trash bin is empty!" => "Nada aqui. Sua lixeira está vazia!",
 "Name" => "Nome",
-"Restore" => "Restaurar",
 "Deleted" => "Excluído",
 "Delete" => "Excluir"
 );
diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php
index 94dd0eb707..8a18d842c9 100644
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ b/apps/files_trashbin/l10n/pt_PT.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Não foi possível eliminar %s de forma permanente",
 "Couldn't restore %s" => "Não foi possível restaurar %s",
 "Deleted files" => "Ficheiros eliminados",
+"Restore" => "Restaurar",
 "Error" => "Erro",
-"Deleted Files" => "Ficheiros Apagados",
 "restored" => "Restaurado",
 "Nothing in here. Your trash bin is empty!" => "Não hà ficheiros. O lixo está vazio!",
 "Name" => "Nome",
-"Restore" => "Restaurar",
 "Deleted" => "Apagado",
 "Delete" => "Eliminar"
 );
diff --git a/apps/files_trashbin/l10n/ru.php b/apps/files_trashbin/l10n/ru.php
index d10369b9ca..8d00e08241 100644
--- a/apps/files_trashbin/l10n/ru.php
+++ b/apps/files_trashbin/l10n/ru.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s не может быть удалён навсегда",
 "Couldn't restore %s" => "%s не может быть восстановлен",
 "Deleted files" => "Удалённые файлы",
+"Restore" => "Восстановить",
 "Error" => "Ошибка",
-"Deleted Files" => "Удаленные файлы",
 "restored" => "восстановлен",
 "Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
 "Name" => "Имя",
-"Restore" => "Восстановить",
 "Deleted" => "Удалён",
 "Delete" => "Удалить"
 );
diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php
index 3badd3a423..7588b555d9 100644
--- a/apps/files_trashbin/l10n/sk_SK.php
+++ b/apps/files_trashbin/l10n/sk_SK.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nemožno zmazať %s navždy",
 "Couldn't restore %s" => "Nemožno obnoviť %s",
 "Deleted files" => "Zmazané súbory",
+"Restore" => "Obnoviť",
 "Error" => "Chyba",
-"Deleted Files" => "Zmazané súbory",
 "restored" => "obnovené",
 "Nothing in here. Your trash bin is empty!" => "Žiadny obsah. Kôš je prázdny!",
 "Name" => "Názov",
-"Restore" => "Obnoviť",
 "Deleted" => "Zmazané",
 "Delete" => "Zmazať"
 );
diff --git a/apps/files_trashbin/l10n/sl.php b/apps/files_trashbin/l10n/sl.php
index 08da9b1c6e..f9dc5112ac 100644
--- a/apps/files_trashbin/l10n/sl.php
+++ b/apps/files_trashbin/l10n/sl.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Datoteke %s ni mogoče trajno izbrisati.",
 "Couldn't restore %s" => "Ni mogoče obnoviti %s",
 "Deleted files" => "Izbrisane datoteke",
+"Restore" => "Obnovi",
 "Error" => "Napaka",
-"Deleted Files" => "Izbrisane datoteke",
 "restored" => "obnovljeno",
 "Nothing in here. Your trash bin is empty!" => "Mapa smeti je prazna.",
 "Name" => "Ime",
-"Restore" => "Obnovi",
 "Deleted" => "Izbrisano",
 "Delete" => "Izbriši"
 );
diff --git a/apps/files_trashbin/l10n/sq.php b/apps/files_trashbin/l10n/sq.php
index 60d16f9b91..9e16b7a7bf 100644
--- a/apps/files_trashbin/l10n/sq.php
+++ b/apps/files_trashbin/l10n/sq.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nuk munda ta eliminoj përfundimisht %s",
 "Couldn't restore %s" => "Nuk munda ta rivendos %s",
 "Deleted files" => "Skedarë të fshirë ",
+"Restore" => "Rivendos",
 "Error" => "Veprim i gabuar",
-"Deleted Files" => "Skedarë të eliminuar",
 "restored" => "rivendosur",
 "Nothing in here. Your trash bin is empty!" => "Këtu nuk ka asgjë. Koshi juaj është bosh!",
 "Name" => "Emri",
-"Restore" => "Rivendos",
 "Deleted" => "Eliminuar",
 "Delete" => "Elimino"
 );
diff --git a/apps/files_trashbin/l10n/sr.php b/apps/files_trashbin/l10n/sr.php
index 7fb4c85ab6..d4abc908c9 100644
--- a/apps/files_trashbin/l10n/sr.php
+++ b/apps/files_trashbin/l10n/sr.php
@@ -1,10 +1,10 @@
 <?php
 $TRANSLATIONS = array(
 "Deleted files" => "Обрисане датотеке",
+"Restore" => "Врати",
 "Error" => "Грешка",
 "Nothing in here. Your trash bin is empty!" => "Овде нема ништа. Корпа за отпатке је празна.",
 "Name" => "Име",
-"Restore" => "Врати",
 "Deleted" => "Обрисано",
 "Delete" => "Обриши"
 );
diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php
index fd9ca8653f..330bcc3482 100644
--- a/apps/files_trashbin/l10n/sv.php
+++ b/apps/files_trashbin/l10n/sv.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kunde inte radera %s permanent",
 "Couldn't restore %s" => "Kunde inte återställa %s",
 "Deleted files" => "Raderade filer",
+"Restore" => "Återskapa",
 "Error" => "Fel",
-"Deleted Files" => "Raderade filer",
 "restored" => "återställd",
 "Nothing in here. Your trash bin is empty!" => "Ingenting här. Din papperskorg är tom!",
 "Name" => "Namn",
-"Restore" => "Återskapa",
 "Deleted" => "Raderad",
 "Delete" => "Radera"
 );
diff --git a/apps/files_trashbin/l10n/th_TH.php b/apps/files_trashbin/l10n/th_TH.php
index 857737c59e..47c3450d2e 100644
--- a/apps/files_trashbin/l10n/th_TH.php
+++ b/apps/files_trashbin/l10n/th_TH.php
@@ -1,10 +1,9 @@
 <?php
 $TRANSLATIONS = array(
+"Restore" => "คืนค่า",
 "Error" => "ข้อผิดพลาด",
-"Deleted Files" => "ไฟล์ที่ลบทิ้ง",
 "Nothing in here. Your trash bin is empty!" => "ไม่มีอะไรอยู่ในนี้ ถังขยะของคุณยังว่างอยู่",
 "Name" => "ชื่อ",
-"Restore" => "คืนค่า",
 "Deleted" => "ลบแล้ว",
 "Delete" => "ลบ"
 );
diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php
index ff4227e38c..ab7441b822 100644
--- a/apps/files_trashbin/l10n/tr.php
+++ b/apps/files_trashbin/l10n/tr.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s alıcı olarak silinemedi",
 "Couldn't restore %s" => "%s geri yüklenemedi",
 "Deleted files" => "Silinmiş dosyalar",
+"Restore" => "Geri yükle",
 "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"
 );
diff --git a/apps/files_trashbin/l10n/uk.php b/apps/files_trashbin/l10n/uk.php
index fa523fa321..328e8da5e0 100644
--- a/apps/files_trashbin/l10n/uk.php
+++ b/apps/files_trashbin/l10n/uk.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Неможливо видалити %s назавжди",
 "Couldn't restore %s" => "Неможливо відновити %s",
 "Deleted files" => "Видалено файлів",
+"Restore" => "Відновити",
 "Error" => "Помилка",
-"Deleted Files" => "Видалено Файлів",
 "restored" => "відновлено",
 "Nothing in here. Your trash bin is empty!" => "Нічого немає. Ваший кошик для сміття пустий!",
 "Name" => "Ім'я",
-"Restore" => "Відновити",
 "Deleted" => "Видалено",
 "Delete" => "Видалити"
 );
diff --git a/apps/files_trashbin/l10n/ur_PK.php b/apps/files_trashbin/l10n/ur_PK.php
index 49c82f5387..fc71b528ce 100644
--- a/apps/files_trashbin/l10n/ur_PK.php
+++ b/apps/files_trashbin/l10n/ur_PK.php
@@ -1,5 +1,14 @@
 <?php
 $TRANSLATIONS = array(
-"Error" => "ایرر"
+"Couldn't delete %s permanently" => "حذف نہیں ہو سکتا %s مستقل طور پر",
+"Couldn't restore %s" => "بحال نہيں کيا جا سکتا %s",
+"Deleted files" => "حذف شدہ فائليں",
+"Restore" => "بحال",
+"Error" => "ایرر",
+"restored" => "بحال شدہ",
+"Nothing in here. Your trash bin is empty!" => " یہاں کچھ بھی نہیں .آپکی ردی کی ٹوکری خالی ہے.",
+"Name" => "اسم",
+"Deleted" => "حذف شدہ ",
+"Delete" => "حذف کریں"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/vi.php b/apps/files_trashbin/l10n/vi.php
index 57c82cea5f..d374effcab 100644
--- a/apps/files_trashbin/l10n/vi.php
+++ b/apps/files_trashbin/l10n/vi.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Không thể xóa %s vĩnh viễn",
 "Couldn't restore %s" => "Không thể khôi phục %s",
 "Deleted files" => "File đã bị xóa",
+"Restore" => "Khôi phục",
 "Error" => "Lỗi",
-"Deleted Files" => "File đã xóa",
 "restored" => "khôi phục",
 "Nothing in here. Your trash bin is empty!" => "Không có gì ở đây. Thùng rác của bạn rỗng!",
 "Name" => "Tên",
-"Restore" => "Khôi phục",
 "Deleted" => "Đã xóa",
 "Delete" => "Xóa"
 );
diff --git a/apps/files_trashbin/l10n/zh_CN.php b/apps/files_trashbin/l10n/zh_CN.php
index ef6a63b295..49cd412299 100644
--- a/apps/files_trashbin/l10n/zh_CN.php
+++ b/apps/files_trashbin/l10n/zh_CN.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "无法彻底删除文件%s",
 "Couldn't restore %s" => "无法恢复%s",
 "Deleted files" => "已删除文件",
+"Restore" => "恢复",
 "Error" => "错误",
-"Deleted Files" => "已删除文件",
 "restored" => "已恢复",
 "Nothing in here. Your trash bin is empty!" => "这里没有东西. 你的回收站是空的!",
 "Name" => "名称",
-"Restore" => "恢复",
 "Deleted" => "已删除",
 "Delete" => "删除"
 );
diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php
index c42d70790e..014527083e 100644
--- a/apps/files_trashbin/l10n/zh_TW.php
+++ b/apps/files_trashbin/l10n/zh_TW.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "無法永久刪除 %s",
 "Couldn't restore %s" => "無法還原 %s",
 "Deleted files" => "回收桶",
+"Restore" => "還原",
 "Error" => "錯誤",
-"Deleted Files" => "已刪除的檔案",
 "restored" => "已還原",
 "Nothing in here. Your trash bin is empty!" => "您的回收桶是空的！",
 "Name" => "名稱",
-"Restore" => "還原",
 "Deleted" => "已刪除",
 "Delete" => "刪除"
 );
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index e6ca73520a..ebedce31ab 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -8,16 +8,19 @@ class Helper
 {
 	/**
 	 * Retrieves the contents of a trash bin directory.
+	 *
 	 * @param string $dir path to the directory inside the trashbin
 	 * or empty to retrieve the root of the trashbin
+	 * @param string $sortAttribute attribute to sort on or empty to disable sorting
+	 * @param bool $sortDescending true for descending sort, false otherwise
 	 * @return \OCP\Files\FileInfo[]
 	 */
-	public static function getTrashFiles($dir){
+	public static function getTrashFiles($dir, $sortAttribute = '', $sortDescending = false){
 		$result = array();
 		$timestamp = null;
 		$user = \OCP\User::getUser();
 
-		$view = new \OC_Filesystemview('/' . $user . '/files_trashbin/files');
+		$view = new \OC\Files\View('/' . $user . '/files_trashbin/files');
 
 		if (ltrim($dir, '/') !== '' && !$view->is_dir($dir)) {
 			throw new \Exception('Directory does not exists');
@@ -57,8 +60,9 @@ class Helper
 			closedir($dirContent);
 		}
 
-		usort($result, array('\OCA\Files\Helper', 'fileCmp'));
-
+		if ($sortAttribute !== '') {
+			return \OCA\Files\Helper::sortFiles($result, $sortAttribute, $sortDescending);
+		}
 		return $result;
 	}
 
diff --git a/apps/files_trashbin/lib/hooks.php b/apps/files_trashbin/lib/hooks.php
index b2c6bc1df5..b6f0fb7e54 100644
--- a/apps/files_trashbin/lib/hooks.php
+++ b/apps/files_trashbin/lib/hooks.php
@@ -29,8 +29,8 @@ namespace OCA\Files_Trashbin;
 class Hooks {
 
 	/**
-	 * @brief Copy files to trash bin
-	 * @param array
+	 * Copy files to trash bin
+	 * @param array $params
 	 *
 	 * This function is connected to the delete signal of OC_Filesystem
 	 * to copy the file to the trash bin
@@ -44,8 +44,8 @@ class Hooks {
 	}
 
 	/**
-	 * @brief clean up user specific settings if user gets deleted
-	 * @param array with uid
+	 * clean up user specific settings if user gets deleted
+	 * @param array $params array with uid
 	 *
 	 * This function is connected to the pre_deleteUser signal of OC_Users
 	 * to remove the used space for the trash bin stored in the database
@@ -56,7 +56,7 @@ class Hooks {
 			Trashbin::deleteUser($uid);
 			}
 	}
-	
+
 	public static function post_write_hook($params) {
 		Trashbin::resizeTrash(\OCP\User::getUser());
 	}
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 9b931333b7..e95f1b13c3 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -62,7 +62,7 @@ class Trashbin {
 
 
 	/**
-	 * @brief copy file to owners trash
+	 * copy file to owners trash
 	 * @param string $sourcePath
 	 * @param string $owner
 	 * @param string $ownerPath
@@ -96,7 +96,7 @@ class Trashbin {
 	/**
 	 * move file to the trash bin
 	 *
-	 * @param $file_path path to the deleted file/directory relative to the files root directory
+	 * @param string $file_path path to the deleted file/directory relative to the files root directory
 	 */
 	public static function move2trash($file_path) {
 		$user = \OCP\User::getUser();
@@ -155,11 +155,11 @@ class Trashbin {
 	/**
 	 * Move file versions to trash so that they can be restored later
 	 *
-	 * @param $file_path path to original file
-	 * @param $filename of deleted file
+	 * @param string $file_path path to original file
+	 * @param string $filename of deleted file
 	 * @param integer $timestamp when the file was deleted
 	 *
-	 * @return size of stored versions
+	 * @return int size of stored versions
 	 */
 	private static function retainVersions($file_path, $filename, $timestamp) {
 		$size = 0;
@@ -200,11 +200,11 @@ class Trashbin {
 	/**
 	 * Move encryption keys to trash so that they can be restored later
 	 *
-	 * @param $file_path path to original file
-	 * @param $filename of deleted file
+	 * @param string $file_path path to original file
+	 * @param string $filename of deleted file
 	 * @param integer $timestamp when the file was deleted
 	 *
-	 * @return size of encryption keys
+	 * @return int size of encryption keys
 	 */
 	private static function retainEncryptionKeys($file_path, $filename, $timestamp) {
 		$size = 0;
@@ -216,7 +216,7 @@ class Trashbin {
 
 			list($owner, $ownerPath) = self::getUidAndFilename($file_path);
 
-			$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $user);
+			$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $user);
 
 			// disable proxy to prevent recursive calls
 			$proxyStatus = \OC_FileProxy::$enabled;
@@ -299,9 +299,9 @@ 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
+	 * @param string $file path to the deleted file
+	 * @param string $filename name of the file
+	 * @param int $timestamp time when the file was deleted
 	 *
 	 * @return bool
 	 */
@@ -373,14 +373,14 @@ class Trashbin {
 	}
 
 	/**
-	 * @brief restore versions from trash bin
+	 * restore versions from trash bin
 	 *
 	 * @param \OC\Files\View $view file view
-	 * @param $file complete path to file
-	 * @param $filename name of file once it was deleted
+	 * @param string $file complete path to file
+	 * @param string $filename name of file once it was deleted
 	 * @param string $uniqueFilename new file name to restore the file without overwriting existing files
-	 * @param $location location if file
-	 * @param $timestamp deleteion time
+	 * @param string $location location if file
+	 * @param int $timestamp deleteion time
 	 *
 	 */
 	private static function restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp) {
@@ -421,14 +421,14 @@ class Trashbin {
 	}
 
 	/**
-	 * @brief restore encryption keys from trash bin
+	 * restore encryption keys from trash bin
 	 *
 	 * @param \OC\Files\View $view
-	 * @param $file complete path to file
-	 * @param $filename name of file
+	 * @param string $file complete path to file
+	 * @param string $filename name of file
 	 * @param string $uniqueFilename new file name to restore the file without overwriting existing files
-	 * @param $location location of file
-	 * @param $timestamp deleteion time
+	 * @param string $location location of file
+	 * @param int $timestamp deleteion time
 	 *
 	 */
 	private static function restoreEncryptionKeys($view, $file, $filename, $uniqueFilename, $location, $timestamp) {
@@ -441,7 +441,7 @@ class Trashbin {
 
 			list($owner, $ownerPath) = self::getUidAndFilename($target);
 
-			$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $user);
+			$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $user);
 
 			if ($util->isSystemWideMountPoint($ownerPath)) {
 				$baseDir = '/files_encryption/';
@@ -498,7 +498,7 @@ class Trashbin {
 					$rootView->rename($ownerShareKey, $baseDir . '/share-keys/' . $ownerPath . '.' . $user . '.shareKey');
 
 					// try to re-share if file is shared
-					$filesystemView = new \OC_FilesystemView('/');
+					$filesystemView = new \OC\Files\View('/');
 					$session = new \OCA\Encryption\Session($filesystemView);
 					$util = new \OCA\Encryption\Util($filesystemView, $user);
 
@@ -523,7 +523,7 @@ class Trashbin {
 	}
 
 	/**
-	 * @brief delete all files from the trash
+	 * delete all files from the trash
 	 */
 	public static function deleteAll() {
 		$user = \OCP\User::getUser();
@@ -537,12 +537,12 @@ class Trashbin {
 
 
 	/**
-	 * @brief delete file from trash bin permanently
+	 * delete file from trash bin permanently
 	 *
-	 * @param $filename path to the file
-	 * @param $timestamp of deletion time
+	 * @param string $filename path to the file
+	 * @param int $timestamp of deletion time
 	 *
-	 * @return size of deleted files
+	 * @return int size of deleted files
 	 */
 	public static function delete($filename, $timestamp = null) {
 		$user = \OCP\User::getUser();
@@ -634,9 +634,9 @@ 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
+	 * @param string $filename path to the file
+	 * @param int $timestamp of deletion time
+	 * @return bool true if file exists, otherwise false
 	 */
 	public static function file_exists($filename, $timestamp = null) {
 		$user = \OCP\User::getUser();
@@ -653,10 +653,10 @@ class Trashbin {
 	}
 
 	/**
-	 * @brief deletes used space for trash bin in db if user was deleted
+	 * deletes used space for trash bin in db if user was deleted
 	 *
 	 * @param type $uid id of deleted user
-	 * @return result of db delete operation
+	 * @return bool result of db delete operation
 	 */
 	public static function deleteUser($uid) {
 		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=?');
@@ -672,7 +672,7 @@ class Trashbin {
 	 * calculate remaining free space for trash bin
 	 *
 	 * @param integer $trashbinSize current size of the trash bin
-	 * @return available free space for trash bin
+	 * @return int available free space for trash bin
 	 */
 	private static function calculateFreeSpace($trashbinSize) {
 		$softQuota = true;
@@ -707,7 +707,7 @@ class Trashbin {
 	}
 
 	/**
-	 * @brief resize trash bin if necessary after a new file was added to ownCloud
+	 * resize trash bin if necessary after a new file was added to ownCloud
 	 * @param string $user user id
 	 */
 	public static function resizeTrash($user) {
@@ -808,8 +808,8 @@ 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
+	 * @param string $filename name of the file which should be restored
+	 * @param int $timestamp timestamp when the file was deleted
 	 */
 	private static function getVersionsFromTrash($filename, $timestamp) {
 		$view = new \OC\Files\View('/' . \OCP\User::getUser() . '/files_trashbin/versions');
@@ -841,8 +841,8 @@ 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 string $location where the file should be restored
+	 * @param string $filename name of the file
 	 * @param \OC\Files\View $view filesystem view relative to users root directory
 	 * @return string with unique extension
 	 */
@@ -871,7 +871,7 @@ class Trashbin {
 	}
 
 	/**
-	 * @brief get the size from a given root folder
+	 * get the size from a given root folder
 	 * @param \OC\Files\View $view file view on the root folder
 	 * @return integer size of the folder
 	 */
@@ -883,11 +883,19 @@ class Trashbin {
 		$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root), \RecursiveIteratorIterator::CHILD_FIRST);
 		$size = 0;
 
-		foreach ($iterator as $path) {
+                /**
+		 * RecursiveDirectoryIterator on an NFS path isn't iterable with foreach
+		 * This bug is fixed in PHP 5.5.9 or before
+		 * See #8376
+		 */
+		$iterator->rewind();
+		while ($iterator->valid()) {
+			$path = $iterator->current();
 			$relpath = substr($path, strlen($root) - 1);
 			if (!$view->is_dir($relpath)) {
 				$size += $view->filesize($relpath);
 			}
+			$iterator->next();
 		}
 		return $size;
 	}
@@ -895,7 +903,7 @@ class Trashbin {
 	/**
 	 * get current size of trash bin from a given user
 	 *
-	 * @param $user user who owns the trash bin
+	 * @param string $user user who owns the trash bin
 	 * @return mixed trash bin size or false if no trash bin size is stored
 	 */
 	private static function getTrashbinSize($user) {
@@ -917,7 +925,7 @@ class Trashbin {
 	}
 
 	/**
-	 * @brief check if trash bin is empty for a given user
+	 * check if trash bin is empty for a given user
 	 * @param string $user
 	 */
 	public static function isEmpty($user) {
diff --git a/apps/files_trashbin/list.php b/apps/files_trashbin/list.php
new file mode 100644
index 0000000000..b4047b82ef
--- /dev/null
+++ b/apps/files_trashbin/list.php
@@ -0,0 +1,11 @@
+<?php
+
+// Check if we are a user
+OCP\User::checkLoggedIn();
+
+
+$tmpl = new OCP\Template('files_trashbin', 'index', '');
+OCP\Util::addStyle('files_trashbin', 'trash');
+OCP\Util::addScript('files_trashbin', 'app');
+OCP\Util::addScript('files_trashbin', 'filelist');
+$tmpl->printPage();
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index b6c61c9b1c..fc18e88c41 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -1,3 +1,4 @@
+<?php /** @var $l OC_L10N */ ?>
 <div id="controls">
 	<div id="file_action_panel"></div>
 </div>
@@ -5,31 +6,29 @@
 
 <div id="emptycontent" class="hidden"><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div>
 
-<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">
+<input type="hidden" name="dir" value="" id="dir">
 
 <table id="filestable">
 	<thead>
 		<tr>
-			<th id='headerName'>
+			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
-				<input type="checkbox" id="select_all" />
-				<label for="select_all"></label>
-				<span class='name'><?php p($l->t( 'Name' )); ?></span>
-				<span class='selectedActions'>
+					<input type="checkbox" id="select_all_trash" class="select-all"/>
+					<label for="select_all_trash"></label>
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+					<span id="selectedActionsList" class='selectedActions'>
 						<a href="" class="undelete">
 							<img class="svg" alt="<?php p($l->t( 'Restore' )); ?>"
 								 src="<?php print_unescaped(OCP\image_path("core", "actions/history.svg")); ?>" />
 							<?php p($l->t('Restore'))?>
 						</a>
-				</span>
+					</span>
 				</div>
 			</th>
-			<th id="headerDate">
-				<span id="modified"><?php p($l->t( 'Deleted' )); ?></span>
+			<th id="headerDate" class="hidden column-mtime">
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Deleted' )); ?></span><span class="sort-indicator"></span></a>
 				<span class="selectedActions">
-					<a href="" class="delete">
+					<a href="" class="delete-selected">
 						<?php p($l->t('Delete'))?>
 						<img class="svg" alt="<?php p($l->t('Delete'))?>"
 							src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" />
@@ -40,4 +39,6 @@
 	</thead>
 	<tbody id="fileList">
 	</tbody>
+	<tfoot>
+	</tfoot>
 </table>
diff --git a/apps/files_trashbin/tests/js/appSpec.js b/apps/files_trashbin/tests/js/appSpec.js
new file mode 100644
index 0000000000..ca7d71831f
--- /dev/null
+++ b/apps/files_trashbin/tests/js/appSpec.js
@@ -0,0 +1,69 @@
+/**
+* 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/>.
+*
+*/
+
+describe('OCA.Trashbin.App tests', function() {
+	var App = OCA.Trashbin.App;
+
+	beforeEach(function() {
+		$('#testArea').append(
+			'<div id="app-navigation">' +
+			'<ul><li data-id="files"><a>Files</a></li>' +
+			'<li data-id="trashbin"><a>Trashbin</a></li>' +
+			'</div>' +
+			'<div id="app-content">' +
+			'<div id="app-content-files" class="hidden">' +
+			'</div>' +
+			'<div id="app-content-trashbin" class="hidden">' +
+			'</div>' +
+			'</div>' +
+			'</div>'
+		);
+		App.initialize($('#app-content-trashbin'));
+	});
+	afterEach(function() {
+		App._initialized = false;
+		App.fileList = null;
+	});
+
+	describe('initialization', function() {
+		it('creates a custom filelist instance', function() {
+			App.initialize();
+			expect(App.fileList).toBeDefined();
+			expect(App.fileList.$el.is('#app-content-trashbin')).toEqual(true);
+		});
+
+		it('registers custom file actions', function() {
+			var fileActions;
+			App.initialize();
+
+			fileActions = App.fileList.fileActions;
+
+			expect(fileActions.actions.all).toBeDefined();
+			expect(fileActions.actions.all.Restore).toBeDefined();
+			expect(fileActions.actions.all.Delete).toBeDefined();
+
+			expect(fileActions.actions.all.Rename).not.toBeDefined();
+			expect(fileActions.actions.all.Download).not.toBeDefined();
+
+			expect(fileActions.defaults.dir).toEqual('Open');
+		});
+	});
+});
diff --git a/apps/files_trashbin/tests/js/filelistSpec.js b/apps/files_trashbin/tests/js/filelistSpec.js
new file mode 100644
index 0000000000..d41c24c3cc
--- /dev/null
+++ b/apps/files_trashbin/tests/js/filelistSpec.js
@@ -0,0 +1,309 @@
+/**
+* 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/>.
+*
+*/
+
+describe('OCA.Trashbin.FileList tests', function() {
+	var testFiles, alertStub, notificationStub, fileList;
+	var FileActions = OCA.Files.FileActions;
+
+	beforeEach(function() {
+		alertStub = sinon.stub(OC.dialogs, 'alert');
+		notificationStub = sinon.stub(OC.Notification, 'show');
+
+		// init parameters and test table elements
+		$('#testArea').append(
+			'<div id="app-content-trashbin">' +
+			// init horrible parameters
+			'<input type="hidden" id="dir" value="/"></input>' +
+			// set this but it shouldn't be used (could be the one from the
+			// files app)
+			'<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
+			// TODO: at some point this will be rendered by the fileList class itself!
+			'<table id="filestable">' +
+			'<thead><tr><th id="headerName" class="hidden">' +
+			'<input type="checkbox" id="select_all_trash" class="select-all">' +
+			'<span class="name">Name</span>' +
+			'<span class="selectedActions hidden">' +
+			'<a href class="undelete">Restore</a>' +
+			'<a href class="delete-selected">Delete</a></span>' +
+			'</th></tr></thead>' +
+			'<tbody id="fileList"></tbody>' +
+			'<tfoot></tfoot>' +
+			'</table>' +
+			'<div id="emptycontent">Empty content message</div>' +
+			'</div>'
+		);
+
+		testFiles = [{
+			id: 1,
+			type: 'file',
+			name: 'One.txt',
+			mtime: 11111000,
+			mimetype: 'text/plain',
+			etag: 'abc'
+		}, {
+			id: 2,
+			type: 'file',
+			name: 'Two.jpg',
+			mtime: 22222000,
+			mimetype: 'image/jpeg',
+			etag: 'def',
+		}, {
+			id: 3,
+			type: 'file',
+			name: 'Three.pdf',
+			mtime: 33333000,
+			mimetype: 'application/pdf',
+			etag: '123',
+		}, {
+			id: 4,
+			type: 'dir',
+			mtime: 99999000,
+			name: 'somedir',
+			mimetype: 'httpd/unix-directory',
+			etag: '456'
+		}];
+
+		fileList = new OCA.Trashbin.FileList($('#app-content-trashbin'));
+		OCA.Trashbin.App.registerFileActions(fileList);
+	});
+	afterEach(function() {
+		testFiles = undefined;
+		fileList = undefined;
+
+		FileActions.clear();
+		$('#dir').remove();
+		notificationStub.restore();
+		alertStub.restore();
+	});
+	describe('Initialization', function() {
+		it('Sorts by mtime by default', function() {
+			expect(fileList._sort).toEqual('mtime');
+			expect(fileList._sortDirection).toEqual('desc');
+		});
+		it('Always returns read and delete permission', function() {
+			expect(fileList.getDirectoryPermissions()).toEqual(OC.PERMISSION_READ | OC.PERMISSION_DELETE);
+		});
+	});
+	describe('Breadcrumbs', function() {
+		beforeEach(function() {
+			var data = {
+				status: 'success',
+				data: {
+					files: testFiles,
+					permissions: 1
+				}
+			};
+			fakeServer.respondWith(/\/index\.php\/apps\/files_trashbin\/ajax\/list.php\?dir=%2Fsubdir/, [
+					200, {
+						"Content-Type": "application/json"
+					},
+					JSON.stringify(data)
+			]);
+		});
+		it('links the breadcrumb to the trashbin view', function() {
+			fileList.changeDirectory('/subdir', false, true);
+			fakeServer.respond();
+			var $crumbs = fileList.$el.find('#controls .crumb');
+			expect($crumbs.length).toEqual(2);
+			expect($crumbs.eq(0).find('a').text()).toEqual('');
+			expect($crumbs.eq(0).find('a').attr('href'))
+				.toEqual(OC.webroot + '/index.php/apps/files?view=trashbin&dir=/');
+			expect($crumbs.eq(1).find('a').text()).toEqual('subdir');
+			expect($crumbs.eq(1).find('a').attr('href'))
+				.toEqual(OC.webroot + '/index.php/apps/files?view=trashbin&dir=/subdir');
+		});
+	});
+	describe('Rendering rows', function() {
+		it('renders rows with the correct data when in root', function() {
+			// dir listing is false when in root
+			$('#dir').val('/');
+			fileList.setFiles(testFiles);
+			var $rows = fileList.$el.find('tbody tr');
+			var $tr = $rows.eq(0);
+			expect($rows.length).toEqual(4);
+			expect($tr.attr('data-id')).toEqual('1');
+			expect($tr.attr('data-type')).toEqual('file');
+			expect($tr.attr('data-file')).toEqual('One.txt.d11111');
+			expect($tr.attr('data-size')).not.toBeDefined();
+			expect($tr.attr('data-etag')).toEqual('abc');
+			expect($tr.attr('data-permissions')).toEqual('9'); // read and delete
+			expect($tr.attr('data-mime')).toEqual('text/plain');
+			expect($tr.attr('data-mtime')).toEqual('11111000');
+			expect($tr.find('a.name').attr('href')).toEqual('#');
+
+			expect($tr.find('.nametext').text().trim()).toEqual('One.txt');
+
+			expect(fileList.findFileEl('One.txt.d11111')[0]).toEqual($tr[0]);
+		});
+		it('renders rows with the correct data when in subdirectory', function() {
+			// dir listing is true when in a subdir
+			$('#dir').val('/subdir');
+
+			fileList.setFiles(testFiles);
+			var $rows = fileList.$el.find('tbody tr');
+			var $tr = $rows.eq(0);
+			expect($rows.length).toEqual(4);
+			expect($tr.attr('data-id')).toEqual('1');
+			expect($tr.attr('data-type')).toEqual('file');
+			expect($tr.attr('data-file')).toEqual('One.txt');
+			expect($tr.attr('data-size')).not.toBeDefined();
+			expect($tr.attr('data-etag')).toEqual('abc');
+			expect($tr.attr('data-permissions')).toEqual('9'); // read and delete
+			expect($tr.attr('data-mime')).toEqual('text/plain');
+			expect($tr.attr('data-mtime')).toEqual('11111000');
+			expect($tr.find('a.name').attr('href')).toEqual('#');
+
+			expect($tr.find('.nametext').text().trim()).toEqual('One.txt');
+
+			expect(fileList.findFileEl('One.txt')[0]).toEqual($tr[0]);
+		});
+		it('does not render a size column', function() {
+			expect(fileList.$el.find('tbody tr .filesize').length).toEqual(0);
+		});
+	});
+	describe('File actions', function() {
+		describe('Deleting single files', function() {
+			// TODO: checks ajax call
+			// TODO: checks spinner
+			// TODO: remove item after delete
+			// TODO: bring back item if delete failed
+		});
+		describe('Restoring single files', function() {
+			// TODO: checks ajax call
+			// TODO: checks spinner
+			// TODO: remove item after restore
+			// TODO: bring back item if restore failed
+		});
+	});
+	describe('file previews', function() {
+		// TODO: check that preview URL is going through files_trashbin
+	});
+	describe('loading file list', function() {
+		// TODO: check that ajax URL is going through files_trashbin
+	});
+	describe('breadcrumbs', function() {
+		// TODO: test label + URL
+	});
+	describe('Global Actions', function() {
+		beforeEach(function() {
+			fileList.setFiles(testFiles);
+			fileList.findFileEl('One.txt.d11111').find('input:checkbox').click();
+			fileList.findFileEl('Three.pdf.d33333').find('input:checkbox').click();
+			fileList.findFileEl('somedir.d99999').find('input:checkbox').click();
+		});
+		describe('Delete', function() {
+			it('Deletes selected files when "Delete" clicked', function() {
+				var request;
+				$('.selectedActions .delete-selected').click();
+				expect(fakeServer.requests.length).toEqual(1);
+				request = fakeServer.requests[0];
+				expect(request.url).toEqual(OC.webroot + '/index.php/apps/files_trashbin/ajax/delete.php');
+				expect(OC.parseQueryString(request.requestBody))
+					.toEqual({'dir': '/', files: '["One.txt.d11111","Three.pdf.d33333","somedir.d99999"]'});
+				fakeServer.requests[0].respond(
+					200,
+					{ 'Content-Type': 'application/json' },
+					JSON.stringify({
+						status: 'success',
+						data: {
+							success: [
+								{filename: 'One.txt.d11111'},
+								{filename: 'Three.pdf.d33333'},
+								{filename: 'somedir.d99999'}
+							]
+						}
+					})
+				);
+				expect(fileList.findFileEl('One.txt.d11111').length).toEqual(0);
+				expect(fileList.findFileEl('Three.pdf.d33333').length).toEqual(0);
+				expect(fileList.findFileEl('somedir.d99999').length).toEqual(0);
+				expect(fileList.findFileEl('Two.jpg.d22222').length).toEqual(1);
+			});
+			it('Deletes all files when all selected when "Delete" clicked', function() {
+				var request;
+				$('.select-all').click();
+				$('.selectedActions .delete-selected').click();
+				expect(fakeServer.requests.length).toEqual(1);
+				request = fakeServer.requests[0];
+				expect(request.url).toEqual(OC.webroot + '/index.php/apps/files_trashbin/ajax/delete.php');
+				expect(OC.parseQueryString(request.requestBody))
+					.toEqual({'dir': '/', allfiles: 'true'});
+				fakeServer.requests[0].respond(
+					200,
+					{ 'Content-Type': 'application/json' },
+					JSON.stringify({status: 'success'})
+				);
+				expect(fileList.isEmpty).toEqual(true);
+			});
+		});
+		describe('Restore', function() {
+			it('Restores selected files when "Restore" clicked', function() {
+				var request;
+				$('.selectedActions .undelete').click();
+				expect(fakeServer.requests.length).toEqual(1);
+				request = fakeServer.requests[0];
+				expect(request.url).toEqual(OC.webroot + '/index.php/apps/files_trashbin/ajax/undelete.php');
+				expect(OC.parseQueryString(request.requestBody))
+					.toEqual({'dir': '/', files: '["One.txt.d11111","Three.pdf.d33333","somedir.d99999"]'});
+				fakeServer.requests[0].respond(
+					200,
+					{ 'Content-Type': 'application/json' },
+					JSON.stringify({
+						status: 'success',
+						data: {
+							success: [
+								{filename: 'One.txt.d11111'},
+								{filename: 'Three.pdf.d33333'},
+								{filename: 'somedir.d99999'}
+							]
+						}
+					})
+				);
+				expect(fileList.findFileEl('One.txt.d11111').length).toEqual(0);
+				expect(fileList.findFileEl('Three.pdf.d33333').length).toEqual(0);
+				expect(fileList.findFileEl('somedir.d99999').length).toEqual(0);
+				expect(fileList.findFileEl('Two.jpg.d22222').length).toEqual(1);
+			});
+			it('Restores all files when all selected when "Restore" clicked', function() {
+				var request;
+				$('.select-all').click();
+				$('.selectedActions .undelete').click();
+				expect(fakeServer.requests.length).toEqual(1);
+				request = fakeServer.requests[0];
+				expect(request.url).toEqual(OC.webroot + '/index.php/apps/files_trashbin/ajax/undelete.php');
+				expect(OC.parseQueryString(request.requestBody))
+					.toEqual({'dir': '/', allfiles: 'true'});
+				fakeServer.requests[0].respond(
+					200,
+					{ 'Content-Type': 'application/json' },
+					JSON.stringify({status: 'success'})
+				);
+				expect(fileList.isEmpty).toEqual(true);
+			});
+		});
+	});
+});
diff --git a/apps/files_versions/appinfo/routes.php b/apps/files_versions/appinfo/routes.php
index 8d2abaa89e..80fe0e5d61 100644
--- a/apps/files_versions/appinfo/routes.php
+++ b/apps/files_versions/appinfo/routes.php
@@ -8,7 +8,8 @@
 // Register with the capabilities API
 OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabilities', 'getCapabilities'), 'files_versions', OC_API::USER_AUTH);
 
-$this->create('core_ajax_versions_preview', '/preview.png')->action(
+/** @var $this \OCP\Route\IRouter */
+$this->create('core_ajax_versions_preview', '/preview')->action(
 function() {
 	require_once __DIR__ . '/../ajax/preview.php';
 });
diff --git a/apps/files_versions/l10n/ur_PK.php b/apps/files_versions/l10n/ur_PK.php
new file mode 100644
index 0000000000..bbf2391a93
--- /dev/null
+++ b/apps/files_versions/l10n/ur_PK.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Restore" => "بحال"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index 5d3882cc3e..2de4001aff 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -29,8 +29,8 @@ class Hooks {
 
 
 	/**
-	 * @brief Erase versions of deleted file
-	 * @param array
+	 * Erase versions of deleted file
+	 * @param array $params
 	 *
 	 * This function is connected to the delete signal of OC_Filesystem
 	 * cleanup the versions directory if the actual file gets deleted
@@ -46,7 +46,7 @@ class Hooks {
 	}
 
 	/**
-	 * @brief mark file as "deleted" so that we can clean up the versions if the file is gone
+	 * mark file as "deleted" so that we can clean up the versions if the file is gone
 	 * @param array $params
 	 */
 	public static function pre_remove_hook($params) {
@@ -57,8 +57,8 @@ class Hooks {
 	}
 
 	/**
-	 * @brief rename/move versions of renamed/moved files
-	 * @param array with oldpath and newpath
+	 * rename/move versions of renamed/moved files
+	 * @param array $params array with oldpath and newpath
 	 *
 	 * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
 	 * of the stored versions along the actual file
@@ -75,8 +75,8 @@ class Hooks {
 	}
 
 	/**
-	 * @brief clean up user specific settings if user gets deleted
-	 * @param array with uid
+	 * clean up user specific settings if user gets deleted
+	 * @param array $params array with uid
 	 *
 	 * This function is connected to the pre_deleteUser signal of OC_Users
 	 * to remove the used space for versions stored in the database
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 290264a90c..56e1dfc2e2 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -53,7 +53,7 @@ class Storage {
 	/**
 	 * get current size of all versions from a given user
 	 *
-	 * @param $user user who owns the versions
+	 * @param string $user user who owns the versions
 	 * @return mixed versions size or false if no versions size is stored
 	 */
 	private static function getVersionsSize($user) {
@@ -69,8 +69,8 @@ class Storage {
 	/**
 	 * write to the database how much space is in use for versions
 	 *
-	 * @param $user owner of the versions
-	 * @param $size size of the versions
+	 * @param string $user owner of the versions
+	 * @param int $size size of the versions
 	 */
 	private static function setVersionsSize($user, $size) {
 		if ( self::getVersionsSize($user) === false) {
@@ -147,7 +147,7 @@ class Storage {
 
 
 	/**
-	 * @brief mark file as deleted so that we can remove the versions if the file is gone
+	 * mark file as deleted so that we can remove the versions if the file is gone
 	 * @param string $path
 	 */
 	public static function markDeletedFile($path) {
@@ -261,11 +261,11 @@ class Storage {
 
 
 	/**
-	 * @brief get a list of all available versions of a file in descending chronological order
+	 * get a list of all available versions of a file in descending chronological order
 	 * @param string $uid user id from the owner of the file
 	 * @param string $filename file to find versions of, relative to the user files dir
 	 * @param string $userFullPath
-	 * @returns array versions newest version first
+	 * @return array versions newest version first
 	 */
 	public static function getVersions($uid, $filename, $userFullPath = '') {
 		$versions = array();
@@ -307,7 +307,7 @@ class Storage {
 	}
 
 	/**
-	 * @brief translate a timestamp into a string like "5 days ago"
+	 * translate a timestamp into a string like "5 days ago"
 	 * @param int $timestamp
 	 * @return string for example "5 days ago"
 	 */
@@ -334,9 +334,9 @@ class Storage {
 	}
 
 	/**
-	 * @brief deletes used space for files versions in db if user was deleted
+	 * deletes used space for files versions in db if user was deleted
 	 *
-	 * @param type $uid id of deleted user
+	 * @param string $uid id of deleted user
 	 * @return \OC_DB_StatementWrapper of db delete operation
 	 */
 	public static function deleteUser($uid) {
@@ -345,9 +345,9 @@ class Storage {
 	}
 
 	/**
-	 * @brief get the size of all stored versions from a given user
-	 * @param $uid id from the user
-	 * @return size of vesions
+	 * get the size of all stored versions from a given user
+	 * @param string $uid id from the user
+	 * @return int size of versions
 	 */
 	private static function calculateSize($uid) {
 		if (\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED) == 'true') {
@@ -372,7 +372,7 @@ class Storage {
 	}
 
 	/**
-	 * @brief returns all stored file versions from a given user
+	 * returns all stored file versions from a given user
 	 * @param string $uid id of the user
 	 * @return array with contains two arrays 'all' which contains all versions sorted by age and 'by_file' which contains all versions sorted by filename
 	 */
@@ -420,7 +420,7 @@ class Storage {
 	}
 
 	/**
-	 * @brief get list of files we want to expire
+	 * get list of files we want to expire
 	 * @param array $versions list of versions
 	 * @param integer $time
 	 * @return array containing the list of to deleted versions and the size of them
@@ -477,7 +477,7 @@ class Storage {
 	}
 
 	/**
-	 * @brief Erase a file's versions which exceed the set quota
+	 * Erase a file's versions which exceed the set quota
 	 */
 	private static function expire($filename, $versionsSize = null, $offset = 0) {
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
@@ -574,12 +574,12 @@ class Storage {
 	}
 
 	/**
-	 * @brief create recursively missing directories
+	 * create recursively missing directories
 	 * @param string $filename $path to a file
 	 * @param \OC\Files\View $view view on data/user/
 	 */
 	private static function createMissingDirectories($filename, $view) {
-		$dirname = \OC_Filesystem::normalizePath(dirname($filename));
+		$dirname = \OC\Files\Filesystem::normalizePath(dirname($filename));
 		$dirParts = explode('/', $dirname);
 		$dir = "/files_versions";
 		foreach ($dirParts as $part) {
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index 9f15b86d98..aa66faffcb 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -24,14 +24,14 @@ require_once __DIR__ . '/../lib/versions.php';
 
 /**
  * Class Test_Files_versions
- * @brief this class provide basic files versions test
+ * this class provide basic files versions test
  */
 class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
 
 
 	/**
 	 * @medium
-	 * @brief test expire logic
+	 * test expire logic
 	 * @dataProvider versionsProvider
 	 */
 	function testGetExpireList($versions, $sizeOfAllDeletedFiles) {
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 3b5f377e10..4051b1d8ca 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -39,10 +39,10 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	}
 
 	/**
-	 * @brief is user in group?
-	 * @param $uid uid of the user
-	 * @param $gid gid of the group
-	 * @returns true/false
+	 * is user in group?
+	 * @param string $uid uid of the user
+	 * @param string $gid gid of the group
+	 * @return bool
 	 *
 	 * Checks whether the user is member of a group or not.
 	 */
@@ -126,9 +126,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	}
 
 	/**
-	 * @brief Get all groups a user belongs to
-	 * @param $uid Name of the user
-	 * @returns array with group names
+	 * Get all groups a user belongs to
+	 * @param string $uid Name of the user
+	 * @return array with group names
 	 *
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
@@ -177,8 +177,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		}
 		$allGroups = array();
 		if (array_key_exists($dn, $seen)) {
-		    // avoid loops
-		    return array();
+			// avoid loops
+			return array();
 		}
 		$seen[$dn] = true;
 		$filter = $this->access->combineFilterWithAnd(array(
@@ -204,8 +204,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	}
 
 	/**
-	 * @brief get a list of all users in a group
-	 * @returns array with user ids
+	 * get a list of all users in a group
+	 * @return array with user ids
 	 */
 	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		if(!$this->enabled) {
@@ -285,10 +285,10 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	}
 
 	/**
-	 * @brief returns the number of users in a group, who match the search term
-	 * @param string the internal group name
-	 * @param string optional, a search string
-	 * @returns int | bool
+	 * returns the number of users in a group, who match the search term
+	 * @param string $gid the internal group name
+	 * @param string $search optional, a search string
+	 * @return int|bool
 	 */
 	public function countUsersInGroup($gid, $search = '') {
 		$cachekey = 'countUsersInGroup-'.$gid.'-'.$search;
@@ -363,27 +363,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	}
 
 	/**
-	 * @brief get a list of all display names in a group
-	 * @returns array with display names (value) and user ids(key)
-	 */
-	public function displayNamesInGroup($gid, $search, $limit, $offset) {
-		if(!$this->enabled) {
-			return array();
-		}
-		if(!$this->groupExists($gid)) {
-			return array();
-		}
-		$users = $this->usersInGroup($gid, $search, $limit, $offset);
-		$displayNames = array();
-		foreach($users as $user) {
-			$displayNames[$user] = \OC_User::getDisplayName($user);
-		}
-		return $displayNames;
-	}
-
-	/**
-	 * @brief get a list of all groups
-	 * @returns array with group names
+	 * get a list of all groups
+	 * @return array with group names
 	 *
 	 * Returns a list with all groups (used by getGroups)
 	 */
@@ -421,8 +402,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	}
 
 	/**
-	 * @brief get a list of all groups using a paged search
-	 * @returns array with group names
+	 * get a list of all groups using a paged search
+	 * @return array with group names
 	 *
 	 * Returns a list with all groups
    	 * Uses a paged search if available to override a
@@ -499,17 +480,14 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	}
 
 	/**
-	* @brief Check if backend implements actions
-	* @param $actions bitwise-or'ed actions
-	* @returns boolean
+	* Check if backend implements actions
+	* @param int $actions bitwise-or'ed actions
+	* @return boolean
 	*
 	* Returns the supported actions as int to be
 	* compared with OC_USER_BACKEND_CREATE_USER etc.
 	*/
 	public function implementsActions($actions) {
-		return (bool)((
-			OC_GROUP_BACKEND_GET_DISPLAYNAME
-			| OC_GROUP_BACKEND_COUNT_USERS
-			) & $actions);
+		return (bool)(OC_GROUP_BACKEND_COUNT_USERS & $actions);
 	}
 }
diff --git a/apps/user_ldap/group_proxy.php b/apps/user_ldap/group_proxy.php
index c000973623..1a36953676 100644
--- a/apps/user_ldap/group_proxy.php
+++ b/apps/user_ldap/group_proxy.php
@@ -30,13 +30,13 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
 	private $refBackend = null;
 
 	/**
-	 * @brief Constructor
-	 * @param $serverConfigPrefixes array containing the config Prefixes
+	 * Constructor
+	 * @param string[] $serverConfigPrefixes array containing the config Prefixes
 	 */
 	public function __construct($serverConfigPrefixes, ILDAPWrapper $ldap) {
 		parent::__construct($ldap);
 		foreach($serverConfigPrefixes as $configPrefix) {
-		    $this->backends[$configPrefix] =
+			$this->backends[$configPrefix] =
 				new \OCA\user_ldap\GROUP_LDAP($this->getAccess($configPrefix));
 			if(is_null($this->refBackend)) {
 				$this->refBackend = &$this->backends[$configPrefix];
@@ -45,29 +45,29 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
 	}
 
 	/**
-	 * @brief Tries the backends one after the other until a positive result is returned from the specified method
-	 * @param $gid string, the gid connected to the request
-	 * @param $method string, the method of the group backend that shall be called
-	 * @param $parameters an array of parameters to be passed
+	 * Tries the backends one after the other until a positive result is returned from the specified method
+	 * @param string $gid the gid connected to the request
+	 * @param string $method the method of the group backend that shall be called
+	 * @param array $parameters an array of parameters to be passed
 	 * @return mixed, the result of the method or false
 	 */
 	protected function walkBackends($gid, $method, $parameters) {
 		$cacheKey = $this->getGroupCacheKey($gid);
 		foreach($this->backends as $configPrefix => $backend) {
-		    if($result = call_user_func_array(array($backend, $method), $parameters)) {
+			if($result = call_user_func_array(array($backend, $method), $parameters)) {
 				$this->writeToCache($cacheKey, $configPrefix);
 				return $result;
-		    }
+			}
 		}
 		return false;
 	}
 
 	/**
-	 * @brief Asks the backend connected to the server that supposely takes care of the gid from the request.
-	 * @param $gid string, the gid connected to the request
-	 * @param $method string, the method of the group backend that shall be called
-	 * @param $parameters an array of parameters to be passed
-	 * @param $passOnWhen the result matches this variable
+	 * Asks the backend connected to the server that supposely takes care of the gid from the request.
+	 * @param string $gid the gid connected to the request
+	 * @param string $method the method of the group backend that shall be called
+	 * @param array $parameters an array of parameters to be passed
+	 * @param mixed $passOnWhen the result matches this variable
 	 * @return mixed, the result of the method or false
 	 */
 	protected function callOnLastSeenOn($gid, $method, $parameters, $passOnWhen) {
@@ -95,10 +95,10 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
 	}
 
 	/**
-	 * @brief is user in group?
-	 * @param $uid uid of the user
-	 * @param $gid gid of the group
-	 * @returns true/false
+	 * is user in group?
+	 * @param string $uid uid of the user
+	 * @param string $gid gid of the group
+	 * @return bool
 	 *
 	 * Checks whether the user is member of a group or not.
 	 */
@@ -107,9 +107,9 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
 	}
 
 	/**
-	 * @brief Get all groups a user belongs to
-	 * @param $uid Name of the user
-	 * @returns array with group names
+	 * Get all groups a user belongs to
+	 * @param string $uid Name of the user
+	 * @return string[] with group names
 	 *
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
@@ -118,7 +118,7 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
 		$groups = array();
 
 		foreach($this->backends as $backend) {
-		    $backendGroups = $backend->getUserGroups($uid);
+			$backendGroups = $backend->getUserGroups($uid);
 			if (is_array($backendGroups)) {
 				$groups = array_merge($groups, $backendGroups);
 			}
@@ -128,14 +128,14 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
 	}
 
 	/**
-	 * @brief get a list of all users in a group
-	 * @returns array with user ids
+	 * get a list of all users in a group
+	 * @return string[] with user ids
 	 */
 	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		$users = array();
 
 		foreach($this->backends as $backend) {
-		    $backendUsers = $backend->usersInGroup($gid, $search, $limit, $offset);
+			$backendUsers = $backend->usersInGroup($gid, $search, $limit, $offset);
 			if (is_array($backendUsers)) {
 				$users = array_merge($users, $backendUsers);
 			}
@@ -145,10 +145,10 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
 	}
 
 	/**
-	 * @brief returns the number of users in a group, who match the search term
-	 * @param string the internal group name
-	 * @param string optional, a search string
-	 * @returns int | bool
+	 * returns the number of users in a group, who match the search term
+	 * @param string $gid the internal group name
+	 * @param string $search optional, a search string
+	 * @return int|bool
 	 */
 	public function countUsersInGroup($gid, $search = '') {
 		return $this->handleRequest(
@@ -156,24 +156,8 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
 	}
 
 	/**
-	 * @brief get a list of all display names in a group
-	 * @returns array with display names (value) and user ids(key)
-	 */
-	public function displayNamesInGroup($gid, $search, $limit, $offset) {
-		$displayNames = array();
-
-		foreach($this->backends as $backend) {
-			$backendUsers = $backend->displayNamesInGroup($gid, $search, $limit, $offset);
-			if (is_array($backendUsers)) {
-				$displayNames = array_merge($displayNames, $backendUsers);
-			}
-		}
-		return $displayNames;
-	}
-
-	/**
-	 * @brief get a list of all groups
-	 * @returns array with group names
+	 * get a list of all groups
+	 * @return string[] with group names
 	 *
 	 * Returns a list with all groups
 	 */
@@ -181,7 +165,7 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
 		$groups = array();
 
 		foreach($this->backends as $backend) {
-		    $backendGroups = $backend->getGroups($search, $limit, $offset);
+			$backendGroups = $backend->getGroups($search, $limit, $offset);
 			if (is_array($backendGroups)) {
 				$groups = array_merge($groups, $backendGroups);
 			}
@@ -200,9 +184,9 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
 	}
 
 	/**
-	 * @brief Check if backend implements actions
-	 * @param $actions bitwise-or'ed actions
-	 * @returns boolean
+	 * Check if backend implements actions
+	 * @param int $actions bitwise-or'ed actions
+	 * @return boolean
 	 *
 	 * Returns the supported actions as int to be
 	 * compared with OC_USER_BACKEND_CREATE_USER etc.
diff --git a/apps/user_ldap/l10n/ast.php b/apps/user_ldap/l10n/ast.php
index 032de8aedb..f793847b23 100644
--- a/apps/user_ldap/l10n/ast.php
+++ b/apps/user_ldap/l10n/ast.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Failed to delete the server configuration" => "Fallu al desaniciar la configuración del sevidor",
+"The configuration is valid and the connection could be established!" => "¡La configuración ye válida y pudo afitase la conexón!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuración ye válida, pero falló'l vínculu.  Por favor, comprueba la configuración y les credenciales nel servidor.",
 "The configuration is invalid. Please have a look at the logs for further details." => "La configuración nun ye válida. Por favor, écha-y un güeyu a los rexistros pa más detalles.",
 "No action specified" => "Nun s'especificó l'aición",
 "No configuration specified" => "Nun s'especificó la configuración",
@@ -14,10 +17,13 @@ $TRANSLATIONS = array(
 "Configuration incomplete" => "Configuración incompleta",
 "Select groups" => "Esbillar grupos",
 "Select attributes" => "Esbillar atributos",
+"Connection test succeeded" => "Test de conexón esitosu",
+"Connection test failed" => "Falló'l test de conexón",
 "_%s group found_::_%s groups found_" => array("%s grupu alcontráu","%s grupos alcontraos"),
 "_%s user found_::_%s users found_" => array("%s usuariu alcontráu","%s usuarios alcontraos"),
 "Could not find the desired feature" => "Nun pudo alcontrase la carauterística deseyada",
 "Save" => "Guardar",
+"Help" => "Ayuda",
 "groups found" => "grupos alcontraos",
 "Users login with this attribute:" => "Aniciu de sesión d'usuarios con esti atributu:",
 "LDAP Username:" => "Nome d'usuariu LDAP",
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index cfc5286a40..b52e2a652d 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "Backup (Replica) Port" => "Δημιουργία αντιγράφων ασφαλείας (Replica) Υποδοχη",
 "Disable Main Server" => "Απενεργοποιηση του κεντρικου διακομιστη",
 "Only connect to the replica server." => "Σύνδεση μόνο με το διακομιστή-αντίγραφο.",
+"Case insensitive LDAP server (Windows)" => "Διακομιστής LDAP με διάκριση πεζών-κεφαλαίων (Windows)",
 "Turn off SSL certificate validation." => "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL.",
 "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Δεν προτείνεται, χρησιμοποιείστε το μόνο για δοκιμές! Εάν η σύνδεση λειτουργεί μόνο με αυτή την επιλογή, εισάγετε το πιστοποιητικό SSL του διακομιστή LDAP στο %s διακομιστή σας.",
 "Cache Time-To-Live" => "Cache Time-To-Live",
@@ -88,6 +89,8 @@ $TRANSLATIONS = array(
 "Group Search Attributes" => "Ομάδα Χαρακτηριστικων Αναζήτηση",
 "Group-Member association" => "Group-Member association",
 "Nested Groups" => "Φωλιασμένες ομάδες",
+"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.)" => "Μέγεθος τμήματος που χρησιμοποιείται για την σελιδοποίηση αναζητήσεων LDAP που μπορεί να επιστρέψουν πολλά δεδομένα, όπως απαρίθμηση χρηστών ή ομάδων. (Η τιμή 0 απενεργοποιεί την σελιδοποίηση των αναζητήσεων LDAP σε αυτές τις περιπτώσεις.)",
 "Special Attributes" => "Ειδικά Χαρακτηριστικά ",
 "Quota Field" => "Ποσοσταση πεδιου",
 "Quota Default" => "Προκαθισμενο πεδιο",
diff --git a/apps/user_ldap/l10n/en_NZ.php b/apps/user_ldap/l10n/en_NZ.php
new file mode 100644
index 0000000000..3a1e002311
--- /dev/null
+++ b/apps/user_ldap/l10n/en_NZ.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/es_BO.php b/apps/user_ldap/l10n/es_BO.php
new file mode 100644
index 0000000000..3a1e002311
--- /dev/null
+++ b/apps/user_ldap/l10n/es_BO.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/es_CO.php b/apps/user_ldap/l10n/es_CO.php
new file mode 100644
index 0000000000..3a1e002311
--- /dev/null
+++ b/apps/user_ldap/l10n/es_CO.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/es_EC.php b/apps/user_ldap/l10n/es_EC.php
new file mode 100644
index 0000000000..3a1e002311
--- /dev/null
+++ b/apps/user_ldap/l10n/es_EC.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/es_PE.php b/apps/user_ldap/l10n/es_PE.php
new file mode 100644
index 0000000000..3a1e002311
--- /dev/null
+++ b/apps/user_ldap/l10n/es_PE.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/es_UY.php b/apps/user_ldap/l10n/es_UY.php
new file mode 100644
index 0000000000..3a1e002311
--- /dev/null
+++ b/apps/user_ldap/l10n/es_UY.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/fa.php b/apps/user_ldap/l10n/fa.php
index 62a949f88b..daf3765fc0 100644
--- a/apps/user_ldap/l10n/fa.php
+++ b/apps/user_ldap/l10n/fa.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "One Base DN per line" => "یک پایه DN در هر خط",
 "You can specify Base DN for users and groups in the Advanced tab" => "شما می توانید پایه DN را برای کاربران و گروه ها در زبانه Advanced مشخص کنید.",
 "Back" => "بازگشت",
+"Continue" => "ادامه",
 "Connection Settings" => "تنظیمات اتصال",
 "Configuration Active" => "پیکربندی فعال",
 "When unchecked, this configuration will be skipped." => "زمانیکه انتخاب نشود، این پیکربندی نادیده گرفته خواهد شد.",
diff --git a/apps/user_ldap/l10n/hi_IN.php b/apps/user_ldap/l10n/hi_IN.php
new file mode 100644
index 0000000000..3a1e002311
--- /dev/null
+++ b/apps/user_ldap/l10n/hi_IN.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/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index 34daa25ce6..5e05eefd1d 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -84,6 +84,7 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Soronként egy csoportfa gyökerét adhatjuk meg",
 "Group Search Attributes" => "A csoportok lekérdezett attribútumai",
 "Group-Member association" => "A csoporttagság attribútuma",
+"Nested Groups" => "Egymásba ágyazott csoportok",
 "Special Attributes" => "Különleges attribútumok",
 "Quota Field" => "Kvóta mező",
 "Quota Default" => "Alapértelmezett kvóta",
diff --git a/apps/user_ldap/l10n/ja.php b/apps/user_ldap/l10n/ja.php
index e7e4706c46..3b47935047 100644
--- a/apps/user_ldap/l10n/ja.php
+++ b/apps/user_ldap/l10n/ja.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "Backup (Replica) Port" => "バックアップ（レプリカ）ポート",
 "Disable Main Server" => "メインサーバーを無効にする",
 "Only connect to the replica server." => "レプリカサーバーにのみ接続します。",
+"Case insensitive LDAP server (Windows)" => "大文字と小文字を区別しない LDAP サーバ (Windows)",
 "Turn off SSL certificate validation." => "SSL証明書の確認を無効にする。",
 "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "推奨されません、テストにおいてのみ使用してください！このオプションでのみ接続が動作する場合は、LDAP サーバーのSSL証明書を %s サーバーにインポートしてください。",
 "Cache Time-To-Live" => "キャッシュのTTL",
@@ -89,6 +90,8 @@ $TRANSLATIONS = array(
 "Group-Member association" => "グループとメンバーの関連付け",
 "Nested Groups" => "ネスト化ブロック",
 "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "オンに切り替えたら、グループを含むグループがサポートされます。(グループメンバーの属性がDNを含む場合のみ有効です。)",
+"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.)" => "ページ分割サイズは、LDAP検索時にユーザーやグループのリスト一覧データを一括で返すデータ量を指定します。(設定が0の場合には、LDAP検索の分割転送は無効)",
 "Special Attributes" => "特殊属性",
 "Quota Field" => "クォータフィールド",
 "Quota Default" => "クォータのデフォルト",
diff --git a/apps/user_ldap/l10n/km.php b/apps/user_ldap/l10n/km.php
index ad3cc4882c..65691c1f52 100644
--- a/apps/user_ldap/l10n/km.php
+++ b/apps/user_ldap/l10n/km.php
@@ -15,6 +15,8 @@ $TRANSLATIONS = array(
 "Help" => "ជំនួយ",
 "Add Server Configuration" => "បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
 "Host" => "ម៉ាស៊ីន​ផ្ទុក",
-"Password" => "ពាក្យសម្ងាត់"
+"Port" => "ច្រក",
+"Password" => "ពាក្យសម្ងាត់",
+"Continue" => "បន្ត"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index e2754785c6..21065b6567 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
 "Failed to delete the server configuration" => "Erro ao eliminar a configuração do servidor",
 "The configuration is valid and the connection could be established!" => "A configuração está correcta e foi possível estabelecer a ligação!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuração está correcta, mas não foi possível estabelecer o \"laço\", por favor, verifique as configurações do servidor e as credenciais.",
+"The configuration is invalid. Please have a look at the logs for further details." => "A configuração é inválida. Por favor, veja o log do ownCloud para mais detalhes.",
 "No action specified" => "Nenhuma acção especificada",
 "No configuration specified" => "Nenhuma configuração especificada",
 "No data specified" => "Nenhuma data especificada",
@@ -52,6 +53,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Para acesso anónimo, deixe DN e a Palavra-passe vazios.",
 "One Base DN per line" => "Uma base DN por linho",
 "You can specify Base DN for users and groups in the Advanced tab" => "Pode especificar o ND Base para utilizadores e grupos no separador Avançado",
+"Limit %s access to users meeting these criteria:" => "Limitar o acesso a %s de utilizadores com estes critérios:",
 "users found" => "utilizadores encontrados",
 "Back" => "Voltar",
 "Continue" => "Continuar",
@@ -92,9 +94,11 @@ $TRANSLATIONS = array(
 "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Por padrão o nome de utilizador interno vai ser criado através do atributo UUID. Desta forma é assegurado que o nome é único e os caracteres não necessitam de serem convertidos. O nome interno tem a restrição de que apenas estes caracteres são permitidos: [ a-zA-Z0-9_.@- ]. Outros caracteres são substituídos pela sua correspondência ASCII ou simplesmente omitidos. Mesmo assim, quando for detetado uma colisão irá ser acrescentado um número. O nome interno é usado para identificar o utilizador internamente. É também o nome utilizado para a pasta inicial no ownCloud. É também parte de URLs remotos, como por exemplo os serviços *DAV. Com esta definição, o comportamento padrão é pode ser sobreposto. Para obter o mesmo comportamento antes do ownCloud 5 introduza o atributo do nome no campo seguinte. Deixe vazio para obter o comportamento padrão. As alterações apenas serão feitas para utilizadores mapeados (adicionados) LDAP.",
 "Internal Username Attribute:" => "Atributo do nome de utilizador interno",
 "Override UUID detection" => "Passar a detecção do UUID",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defeito, o ownCloud detecta automaticamente o atributo UUID. Este atributo é usado para identificar inequivocamente grupos e utilizadores LDAP. Igualmente, o nome de utilizador interno é criado com base no UUID, se o contrário não for especificado. Pode sobrepor esta definição colocando um atributo à sua escolha. Tenha em atenção que esse atributo deve ser válido tanto para grupos como para utilizadores, e que é único. Deixe em branco para optar pelo comportamento por defeito. Estas alteração apenas terão efeito em novos utilizadores e grupos mapeados (adicionados).",
 "UUID Attribute for Users:" => "Atributo UUID para utilizadores:",
 "UUID Attribute for Groups:" => "Atributo UUID para grupos:",
 "Username-LDAP User Mapping" => "Mapeamento do utilizador LDAP",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestígios em todo o lado. A limpeza dos mapeamentos não é sensível à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental.",
 "Clear Username-LDAP User Mapping" => "Limpar mapeamento do utilizador-LDAP",
 "Clear Groupname-LDAP Group Mapping" => "Limpar o mapeamento do nome de grupo LDAP"
 );
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index 26394db0f8..0a91abe29c 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -1,12 +1,29 @@
 <?php
 $TRANSLATIONS = array(
+"The configuration is valid and the connection could be established!" => "Configuraţia este valida şi s-a stabilit conectarea",
+"No action specified" => "Nu este specificata nici o acţiune ",
+"No configuration specified" => "Nu este specificata nici o configurare ",
 "Deletion failed" => "Ștergerea a eșuat",
+"Keep settings?" => "Păstraţi setările ?",
+"Cannot add server configuration" => "Nu se poate adăuga configuraţia serverului ",
 "Success" => "Succes",
 "Error" => "Eroare",
+"Configuration OK" => "Configuraţie valida",
+"Configuration incorrect" => "Configuraţie incorecta ",
+"Configuration incomplete" => "Configuraţie incompleta ",
+"Select groups" => "Selectaţi grupuri ",
+"Select attributes" => "Selectaţi caracteristici",
+"Connection test succeeded" => "Testul de conectare a reuşit ",
+"Connection test failed" => "Testul de conectare a eşuat ",
+"Do you really want to delete the current Server Configuration?" => "Sunteţi sigur ca vreţi sa ştergeţi configuraţia actuala a serverului ?",
+"Confirm Deletion" => "Confirmaţi Ştergerea ",
 "_%s group found_::_%s groups found_" => array("","",""),
 "_%s user found_::_%s users found_" => array("","",""),
 "Save" => "Salvează",
+"Test Configuration" => "Configurare test",
 "Help" => "Ajutor",
+"Other Attributes:" => "Alte caracteristici :",
+"Add Server Configuration" => "Adăugaţi Configuraţia Serverului",
 "Host" => "Gazdă",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://",
 "Port" => "Portul",
@@ -16,11 +33,16 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Pentru acces anonim, lăsați DN și Parolă libere.",
 "One Base DN per line" => "Un Base DN pe linie",
 "You can specify Base DN for users and groups in the Advanced tab" => "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat",
+"users found" => "Utilizatori găsiţi ",
 "Back" => "Înapoi",
 "Continue" => "Continuă",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atenție</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcționa. Contactează administratorul sistemului pentru al instala.",
+"Connection Settings" => "Setările de conexiune",
+"Configuration Active" => "Configuraţie activa ",
+"Disable Main Server" => "Dezactivaţi serverul principal",
 "Turn off SSL certificate validation." => "Oprește validarea certificatelor SSL ",
 "in seconds. A change empties the cache." => "în secunde. O schimbare curăță memoria tampon.",
+"Directory Settings" => "Setările directorului",
 "User Display Name Field" => "Câmpul cu numele vizibil al utilizatorului",
 "Base User Tree" => "Arborele de bază al Utilizatorilor",
 "One User Base DN per line" => "Un User Base DN pe linie",
@@ -28,7 +50,9 @@ $TRANSLATIONS = array(
 "Base Group Tree" => "Arborele de bază al Grupurilor",
 "One Group Base DN per line" => "Un Group Base DN pe linie",
 "Group-Member association" => "Asocierea Grup-Membru",
+"Special Attributes" => "Caracteristici speciale ",
 "in bytes" => "în octeți",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD."
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD.",
+"Internal Username" => "Nume utilizator intern"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index e719f01c37..cb94d0e16a 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.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" => "Исходный LDAP фильтр",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Этот фильтр определяет, какие LDAP группы должны иметь доступ к %s.",
 "groups found" => "групп найдено",
+"Users login with this attribute:" => "Пользователи пользуются этим атрибутом для входа:",
 "LDAP Username:" => "Имя пользователя LDAP",
 "LDAP Email Address:" => "LDAP адрес электронной почты:",
 "Other Attributes:" => "Другие атрибуты:",
@@ -86,6 +88,10 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "По одной базовому DN групп в строке.",
 "Group Search Attributes" => "Атрибуты поиска для группы",
 "Group-Member association" => "Ассоциация Группа-Участник",
+"Nested Groups" => "Вложенные группы",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "При включении, активируется поддержка групп, содержащих другие группы. (Работает только если атрибут член группы содержит DN.)",
+"Paging chunksize" => "Постраничный 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 используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Настройка его  в \"0\" отключает страничный поиск LDAP для таких ситуаций.)",
 "Special Attributes" => "Специальные атрибуты",
 "Quota Field" => "Поле квоты",
 "Quota Default" => "Квота по умолчанию",
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index 3c6b51824f..fdcb4ea81b 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -89,6 +89,7 @@ $TRANSLATIONS = array(
 "Group Search Attributes" => "Atribúty vyhľadávania skupín",
 "Group-Member association" => "Priradenie člena skupiny",
 "Nested Groups" => "Vnorené skupiny",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Ak je zapnuté, tak je možné používať skupiny, ktoré obsahujú iné skupiny. (Funguje, len ak atribút člena skupiny obsahuje DN.)",
 "Special Attributes" => "Špeciálne atribúty",
 "Quota Field" => "Pole kvóty",
 "Quota Default" => "Predvolená kvóta",
diff --git a/apps/user_ldap/l10n/ta_IN.php b/apps/user_ldap/l10n/ta_IN.php
new file mode 100644
index 0000000000..3a1e002311
--- /dev/null
+++ b/apps/user_ldap/l10n/ta_IN.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/ur_PK.php b/apps/user_ldap/l10n/ur_PK.php
index 9fbd174bd1..0f7c45fe62 100644
--- a/apps/user_ldap/l10n/ur_PK.php
+++ b/apps/user_ldap/l10n/ur_PK.php
@@ -3,7 +3,9 @@ $TRANSLATIONS = array(
 "Error" => "ایرر",
 "_%s group found_::_%s groups found_" => array("",""),
 "_%s user found_::_%s users found_" => array("",""),
+"Save" => "حفظ",
 "Help" => "مدد",
-"Password" => "پاسورڈ"
+"Password" => "پاسورڈ",
+"Continue" => "جاری"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 712407505f..78de14f4ee 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -23,6 +23,10 @@
 
 namespace OCA\user_ldap\lib;
 
+/**
+ * Class Access
+ * @package OCA\user_ldap\lib
+ */
 class Access extends LDAPUtility {
 	public $connection;
 	//never ever check this var directly, always use getPagedSearchResultState
@@ -30,24 +34,30 @@ class Access extends LDAPUtility {
 
 	protected $cookies = array();
 
+	/**
+	 * @param Connection $connection
+	 * @param ILDAPWrapper $ldap
+	 */
 	public function __construct(Connection $connection, ILDAPWrapper $ldap) {
 		parent::__construct($ldap);
 		$this->connection = $connection;
 	}
 
+	/**
+	 * @return bool
+	 */
 	private function checkConnection() {
 		return ($this->connection instanceof Connection);
 	}
 
 	/**
-	 * @brief reads a given attribute for an LDAP record identified by a DN
-	 * @param $dn the record in question
-	 * @param $attr the attribute that shall be retrieved
+	 * reads a given attribute for an LDAP record identified by a DN
+	 * @param string $dn the record in question
+	 * @param string $attr the attribute that shall be retrieved
 	 *        if empty, just check the record's existence
-	 * @returns an array of values on success or an empty
+	 * @param string $filter
+	 * @return array|false an array of values on success or an empty
 	 *          array if $attr is empty, false otherwise
-	 *
-	 * Reads an attribute from an LDAP entry or check if entry exists
 	 */
 	public function readAttribute($dn, $attr, $filter = 'objectClass=*') {
 		if(!$this->checkConnection()) {
@@ -105,7 +115,7 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief checks wether the given attribute`s valua is probably a DN
+	 * checks whether the given attributes value is probably a DN
 	 * @param string $attr the attribute in question
 	 * @return boolean if so true, otherwise false
 	 */
@@ -119,16 +129,16 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief sanitizes a DN received from the LDAP server
-	 * @param $dn the DN in question
-	 * @return the sanitized DN
+	 * sanitizes a DN received from the LDAP server
+	 * @param array $dn the DN in question
+	 * @return array the sanitized DN
 	 */
 	private function sanitizeDN($dn) {
 		//treating multiple base DNs
 		if(is_array($dn)) {
 			$result = array();
 			foreach($dn as $singleDN) {
-			    $result[] = $this->sanitizeDN($singleDN);
+				$result[] = $this->sanitizeDN($singleDN);
 			}
 			return $result;
 		}
@@ -163,7 +173,8 @@ class Access extends LDAPUtility {
 
 	/**
 	 * gives back the database table for the query
-	 * @param boolean $isUser
+	 * @param bool $isUser
+	 * @return string
 	 */
 	private function getMapTable($isUser) {
 		if($isUser) {
@@ -174,11 +185,9 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief returns the LDAP DN for the given internal ownCloud name of the group
-	 * @param string $name the ownCloud name in question
-	 * @returns string with the LDAP DN on success, otherwise false
-	 *
 	 * returns the LDAP DN for the given internal ownCloud name of the group
+	 * @param string $name the ownCloud name in question
+	 * @return string with the LDAP DN on success, otherwise false
 	 */
 	public function groupname2dn($name) {
 		$dn = $this->ocname2dn($name, false);
@@ -191,11 +200,9 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief returns the LDAP DN for the given internal ownCloud name of the user
-	 * @param $name the ownCloud name in question
-	 * @returns string with the LDAP DN on success, otherwise false
-	 *
 	 * returns the LDAP DN for the given internal ownCloud name of the user
+	 * @param string $name the ownCloud name in question
+	 * @return string with the LDAP DN on success, otherwise false
 	 */
 	public function username2dn($name) {
 		$dn = $this->ocname2dn($name, true);
@@ -209,12 +216,10 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief returns the LDAP DN for the given internal ownCloud name
-	 * @param $name the ownCloud name in question
-	 * @param boolean $isUser is it a user? otherwise group
-	 * @returns string with the LDAP DN on success, otherwise false
-	 *
 	 * returns the LDAP DN for the given internal ownCloud name
+	 * @param string $name the ownCloud name in question
+	 * @param boolean $isUser is it a user? otherwise group
+	 * @return string with the LDAP DN on success, otherwise false
 	 */
 	private function ocname2dn($name, $isUser) {
 		$table = $this->getMapTable($isUser);
@@ -230,15 +235,12 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief returns the internal ownCloud name for the given LDAP DN of the group
-	 * @param $dn the dn of the group object
-	 * @param $ldapname optional, the display name of the object
-	 * @returns string with with the name to use in ownCloud, false on DN outside of search DN
-	 *
-	 * returns the internal ownCloud name for the given LDAP DN of the
-	 * group, false on DN outside of search DN or failure
+	 * returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure
+	 * @param string $dn the dn of the group object
+	 * @param string $ldapName optional, the display name of the object
+	 * @return string with the name to use in ownCloud, false on DN outside of search DN
 	 */
-	public function dn2groupname($dn, $ldapname = null) {
+	public function dn2groupname($dn, $ldapName = null) {
 		//To avoid bypassing the base DN settings under certain circumstances
 		//with the group support, check whether the provided DN matches one of
 		//the given Bases
@@ -246,18 +248,16 @@ class Access extends LDAPUtility {
 			return false;
 		}
 
-		return $this->dn2ocname($dn, $ldapname, false);
+		return $this->dn2ocname($dn, $ldapName, false);
 	}
 
 	/**
-	 * @brief returns the internal ownCloud name for the given LDAP DN of the user
-	 * @param $dn the dn of the user object
-	 * @param $ldapname optional, the display name of the object
-	 * @returns string with with the name to use in ownCloud
-	 *
 	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure
+	 * @param string $dn the dn of the user object
+	 * @param string $ldapName optional, the display name of the object
+	 * @return string with with the name to use in ownCloud
 	 */
-	public function dn2username($dn, $ldapname = null) {
+	public function dn2username($dn, $ldapName = null) {
 		//To avoid bypassing the base DN settings under certain circumstances
 		//with the group support, check whether the provided DN matches one of
 		//the given Bases
@@ -265,19 +265,17 @@ class Access extends LDAPUtility {
 			return false;
 		}
 
-		return $this->dn2ocname($dn, $ldapname, true);
+		return $this->dn2ocname($dn, $ldapName, true);
 	}
 
 	/**
-	 * @brief returns an internal ownCloud name for the given LDAP DN
-	 * @param $dn the dn of the user object
-	 * @param $ldapname optional, the display name of the object
-	 * @param $isUser optional, wether it is a user object (otherwise group assumed)
-	 * @returns string with with the name to use in ownCloud
-	 *
-	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN
+	 * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN
+	 * @param string $dn the dn of the user object
+	 * @param string $ldapName optional, the display name of the object
+	 * @param bool $isUser optional, whether it is a user object (otherwise group assumed)
+	 * @return string with with the name to use in ownCloud
 	 */
-	public function dn2ocname($dn, $ldapname = null, $isUser = true) {
+	public function dn2ocname($dn, $ldapName = null, $isUser = true) {
 		$table = $this->getMapTable($isUser);
 		if($isUser) {
 			$fncFindMappedName = 'findMappedUser';
@@ -288,9 +286,9 @@ class Access extends LDAPUtility {
 		}
 
 		//let's try to retrieve the ownCloud name from the mappings table
-		$ocname = $this->$fncFindMappedName($dn);
-		if($ocname) {
-			return $ocname;
+		$ocName = $this->$fncFindMappedName($dn);
+		if($ocName) {
+			return $ocName;
 		}
 
 		//second try: get the UUID and check if it is known. Then, update the DN and return the name.
@@ -317,13 +315,13 @@ class Access extends LDAPUtility {
 			return false;
 		}
 
-		if(is_null($ldapname)) {
-			$ldapname = $this->readAttribute($dn, $nameAttribute);
-			if(!isset($ldapname[0]) && empty($ldapname[0])) {
+		if(is_null($ldapName)) {
+			$ldapName = $this->readAttribute($dn, $nameAttribute);
+			if(!isset($ldapName[0]) && empty($ldapName[0])) {
 				\OCP\Util::writeLog('user_ldap', 'No or empty name for '.$dn.'.', \OCP\Util::INFO);
 				return false;
 			}
-			$ldapname = $ldapname[0];
+			$ldapName = $ldapName[0];
 		}
 
 		if($isUser) {
@@ -334,27 +332,27 @@ class Access extends LDAPUtility {
 			} else {
 				$username = $uuid;
 			}
-			$intname = $this->sanitizeUsername($username);
+			$intName = $this->sanitizeUsername($username);
 		} else {
-			$intname = $ldapname;
+			$intName = $ldapName;
 		}
 
 		//a new user/group! Add it only if it doesn't conflict with other backend's users or existing groups
 		//disabling Cache is required to avoid that the new user is cached as not-existing in fooExists check
 		$originalTTL = $this->connection->ldapCacheTTL;
 		$this->connection->setConfiguration(array('ldapCacheTTL' => 0));
-		if(($isUser && !\OCP\User::userExists($intname))
-			|| (!$isUser && !\OC_Group::groupExists($intname))) {
-			if($this->mapComponent($dn, $intname, $isUser)) {
+		if(($isUser && !\OCP\User::userExists($intName))
+			|| (!$isUser && !\OC_Group::groupExists($intName))) {
+			if($this->mapComponent($dn, $intName, $isUser)) {
 				$this->connection->setConfiguration(array('ldapCacheTTL' => $originalTTL));
-				return $intname;
+				return $intName;
 			}
 		}
 		$this->connection->setConfiguration(array('ldapCacheTTL' => $originalTTL));
 
-		$altname = $this->createAltInternalOwnCloudName($intname, $isUser);
-		if($this->mapComponent($dn, $altname, $isUser)) {
-			return $altname;
+		$altName = $this->createAltInternalOwnCloudName($intName, $isUser);
+		if($this->mapComponent($dn, $altName, $isUser)) {
+			return $altName;
 		}
 
 		//if everything else did not help..
@@ -363,9 +361,9 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief gives back the user names as they are used ownClod internally
-	 * @param $ldapGroups an array with the ldap Users result in style of array ( array ('dn' => foo, 'uid' => bar), ... )
-	 * @returns an array with the user names to use in ownCloud
+	 * gives back the user names as they are used ownClod internally
+	 * @param array $ldapUsers an array with the ldap Users result in style of array ( array ('dn' => foo, 'uid' => bar), ... )
+	 * @return array an array with the user names to use in ownCloud
 	 *
 	 * gives back the user names as they are used ownClod internally
 	 */
@@ -374,9 +372,9 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief gives back the group names as they are used ownClod internally
-	 * @param $ldapGroups an array with the ldap Groups result in style of array ( array ('dn' => foo, 'cn' => bar), ... )
-	 * @returns an array with the group names to use in ownCloud
+	 * gives back the group names as they are used ownClod internally
+	 * @param array $ldapGroups an array with the ldap Groups result in style of array ( array ('dn' => foo, 'cn' => bar), ... )
+	 * @return array an array with the group names to use in ownCloud
 	 *
 	 * gives back the group names as they are used ownClod internally
 	 */
@@ -384,6 +382,10 @@ class Access extends LDAPUtility {
 		return $this->ldap2ownCloudNames($ldapGroups, false);
 	}
 
+	/**
+	 * @param string $dn
+	 * @return bool|string
+	 */
 	private function findMappedUser($dn) {
 		static $query = null;
 		if(is_null($query)) {
@@ -400,6 +402,10 @@ class Access extends LDAPUtility {
 		return false;
 	}
 
+	/**
+	 * @param string $dn
+	 * @return bool|string
+	 */
 	private function findMappedGroup($dn) {
 		static $query = null;
 		if(is_null($query)) {
@@ -416,9 +422,10 @@ class Access extends LDAPUtility {
 		return false;
 	}
 
-
 	/**
-	 * @param boolean $isUsers
+	 * @param array $ldapObjects
+	 * @param bool $isUsers
+	 * @return array
 	 */
 	private function ldap2ownCloudNames($ldapObjects, $isUsers) {
 		if($isUsers) {
@@ -430,13 +437,13 @@ class Access extends LDAPUtility {
 
 		foreach($ldapObjects as $ldapObject) {
 			$nameByLDAP = isset($ldapObject[$nameAttribute]) ? $ldapObject[$nameAttribute] : null;
-			$ocname = $this->dn2ocname($ldapObject['dn'], $nameByLDAP, $isUsers);
-			if($ocname) {
-				$ownCloudNames[] = $ocname;
+			$ocName = $this->dn2ocname($ldapObject['dn'], $nameByLDAP, $isUsers);
+			if($ocName) {
+				$ownCloudNames[] = $ocName;
 				if($isUsers) {
 					//cache the user names so it does not need to be retrieved
 					//again later (e.g. sharing dialogue).
-					$this->cacheUserDisplayName($ocname, $nameByLDAP);
+					$this->cacheUserDisplayName($ocName, $nameByLDAP);
 				}
 			}
 			continue;
@@ -445,19 +452,19 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief caches the user display name
-	 * @param string the internal owncloud username
-	 * @param string the display name
+	 * caches the user display name
+	 * @param string $ocName the internal ownCloud username
+	 * @param string $displayName the display name
 	 */
-	public function cacheUserDisplayName($ocname, $displayName) {
+	public function cacheUserDisplayName($ocName, $displayName) {
 		$cacheKeyTrunk = 'getDisplayName';
-		$this->connection->writeToCache($cacheKeyTrunk.$ocname, $displayName);
+		$this->connection->writeToCache($cacheKeyTrunk.$ocName, $displayName);
 	}
 
 	/**
-	 * @brief creates a unique name for internal ownCloud use for users. Don't call it directly.
-	 * @param $name the display name of the object
-	 * @returns string with with the name to use in ownCloud or false if unsuccessful
+	 * creates a unique name for internal ownCloud use for users. Don't call it directly.
+	 * @param string $name the display name of the object
+	 * @return string with with the name to use in ownCloud or false if unsuccessful
 	 *
 	 * Instead of using this method directly, call
 	 * createAltInternalOwnCloudName($name, true)
@@ -477,9 +484,9 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief creates a unique name for internal ownCloud use for groups. Don't call it directly.
-	 * @param $name the display name of the object
-	 * @returns string with with the name to use in ownCloud or false if unsuccessful.
+	 * creates a unique name for internal ownCloud use for groups. Don't call it directly.
+	 * @param string $name the display name of the object
+	 * @return string with with the name to use in ownCloud or false if unsuccessful.
 	 *
 	 * Instead of using this method directly, call
 	 * createAltInternalOwnCloudName($name, false)
@@ -504,17 +511,17 @@ class Access extends LDAPUtility {
 			$lastNo = 1; //will become name_2
 		} else {
 			natsort($usedNames);
-			$lastname = array_pop($usedNames);
-			$lastNo = intval(substr($lastname, strrpos($lastname, '_') + 1));
+			$lastName = array_pop($usedNames);
+			$lastNo = intval(substr($lastName, strrpos($lastName, '_') + 1));
 		}
 		$altName = $name.'_'.strval($lastNo+1);
 		unset($usedNames);
 
 		$attempts = 1;
 		while($attempts < 21){
-			//Pro forma check to be really sure it is unique
-			//while loop is just a precaution. If a name is not generated within
-			//20 attempts, something else is very wrong. Avoids infinite loop.
+			// Check to be really sure it is unique
+			// while loop is just a precaution. If a name is not generated within
+			// 20 attempts, something else is very wrong. Avoids infinite loop.
 			if(!\OC_Group::groupExists($altName)) {
 				return $altName;
 			}
@@ -525,10 +532,10 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief creates a unique name for internal ownCloud use.
-	 * @param $name the display name of the object
+	 * creates a unique name for internal ownCloud use.
+	 * @param string $name the display name of the object
 	 * @param boolean $isUser whether name should be created for a user (true) or a group (false)
-	 * @returns string with with the name to use in ownCloud or false if unsuccessful
+	 * @return string with with the name to use in ownCloud or false if unsuccessful
 	 */
 	private function createAltInternalOwnCloudName($name, $isUser) {
 		$originalTTL = $this->connection->ldapCacheTTL;
@@ -544,8 +551,8 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief retrieves all known groups from the mappings table
-	 * @returns array with the results
+	 * retrieves all known groups from the mappings table
+	 * @return array with the results
 	 *
 	 * retrieves all known groups from the mappings table
 	 */
@@ -554,8 +561,8 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief retrieves all known users from the mappings table
-	 * @returns array with the results
+	 * retrieves all known users from the mappings table
+	 * @return array with the results
 	 *
 	 * retrieves all known users from the mappings table
 	 */
@@ -578,20 +585,20 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief inserts a new user or group into the mappings table
-	 * @param $dn the record in question
-	 * @param $ocname the name to use in ownCloud
-	 * @param $isUser is it a user or a group?
-	 * @returns true on success, false otherwise
+	 * inserts a new user or group into the mappings table
+	 * @param string $dn the record in question
+	 * @param string $ocName the name to use in ownCloud
+	 * @param bool $isUser is it a user or a group?
+	 * @return bool true on success, false otherwise
 	 *
 	 * inserts a new user or group into the mappings table
 	 */
-	private function mapComponent($dn, $ocname, $isUser = true) {
+	private function mapComponent($dn, $ocName, $isUser = true) {
 		$table = $this->getMapTable($isUser);
 
 		$sqlAdjustment = '';
-		$dbtype = \OCP\Config::getSystemValue('dbtype');
-		if($dbtype === 'mysql') {
+		$dbType = \OCP\Config::getSystemValue('dbtype');
+		if($dbType === 'mysql') {
 			$sqlAdjustment = 'FROM DUAL';
 		}
 
@@ -607,9 +614,9 @@ class Access extends LDAPUtility {
 		');
 
 		//feed the DB
-		$insRows = $insert->execute(array($dn, $ocname,
+		$insRows = $insert->execute(array($dn, $ocName,
 										  $this->getUUID($dn, $isUser), $dn,
-										  $ocname));
+										  $ocName));
 
 		if(\OCP\DB::isError($insRows)) {
 			return false;
@@ -623,8 +630,11 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @param integer $limit
-	 * @param integer $offset
+	 * @param string $filter
+	 * @param string|string[] $attr
+	 * @param int $limit
+	 * @param int $offset
+	 * @return array
 	 */
 	public function fetchListOfUsers($filter, $attr, $limit = null, $offset = null) {
 		return $this->fetchList($this->searchUsers($filter, $attr, $limit, $offset), (count($attr) > 1));
@@ -632,15 +642,19 @@ class Access extends LDAPUtility {
 
 	/**
 	 * @param string $filter
-	 * @param integer $limit
-	 * @param integer $offset
+	 * @param string|string[] $attr
+	 * @param int $limit
+	 * @param int $offset
+	 * @return array
 	 */
 	public function fetchListOfGroups($filter, $attr, $limit = null, $offset = null) {
 		return $this->fetchList($this->searchGroups($filter, $attr, $limit, $offset), (count($attr) > 1));
 	}
 
 	/**
-	 * @param boolean $manyAttributes
+	 * @param array $list
+	 * @param bool $manyAttributes
+	 * @return array
 	 */
 	private function fetchList($list, $manyAttributes) {
 		if(is_array($list)) {
@@ -656,12 +670,12 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief executes an LDAP search, optimized for Users
-	 * @param $filter the LDAP filter for the search
-	 * @param $attr optional, when a certain attribute shall be filtered out
+	 * executes an LDAP search, optimized for Users
+	 * @param string $filter the LDAP filter for the search
+	 * @param string|string[] $attr optional, when a certain attribute shall be filtered out
 	 * @param integer $limit
 	 * @param integer $offset
-	 * @returns array with the search result
+	 * @return array with the search result
 	 *
 	 * Executes an LDAP search
 	 */
@@ -671,18 +685,22 @@ class Access extends LDAPUtility {
 
 	/**
 	 * @param string $filter
+	 * @param string|string[] $attr
+	 * @param int $limit
+	 * @param int $offset
+	 * @return false|int
 	 */
 	public function countUsers($filter, $attr = array('dn'), $limit = null, $offset = null) {
 		return $this->count($filter, $this->connection->ldapBaseUsers, $attr, $limit, $offset);
 	}
 
 	/**
-	 * @brief executes an LDAP search, optimized for Groups
+	 * executes an LDAP search, optimized for Groups
 	 * @param string $filter the LDAP filter for the search
-	 * @param $attr optional, when a certain attribute shall be filtered out
+	 * @param string|string[] $attr optional, when a certain attribute shall be filtered out
 	 * @param integer $limit
 	 * @param integer $offset
-	 * @returns array with the search result
+	 * @return array with the search result
 	 *
 	 * Executes an LDAP search
 	 */
@@ -691,14 +709,14 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief prepares and executes an LDAP search operation
-	 * @param $filter the LDAP filter for the search
-	 * @param $base an array containing the LDAP subtree(s) that shall be searched
-	 * @param $attr optional, array, one or more attributes that shall be
+	 * prepares and executes an LDAP search operation
+	 * @param string $filter the LDAP filter for the search
+	 * @param array $base an array containing the LDAP subtree(s) that shall be searched
+	 * @param string|string[] $attr optional, array, one or more attributes that shall be
 	 * retrieved. Results will according to the order in the array.
-	 * @param $limit optional, maximum results to be counted
-	 * @param $offset optional, a starting point
-	 * @returns array with the search result as first value and pagedSearchOK as
+	 * @param int $limit optional, maximum results to be counted
+	 * @param int $offset optional, a starting point
+	 * @return array|false array with the search result as first value and pagedSearchOK as
 	 * second | false if not successful
 	 */
 	private function executeSearch($filter, $base, &$attr = null, $limit = null, $offset = null) {
@@ -715,7 +733,7 @@ class Access extends LDAPUtility {
 			return false;
 		}
 
-		//check wether paged search should be attempted
+		//check whether paged search should be attempted
 		$pagedSearchOK = $this->initPagedSearch($filter, $base, $attr, $limit, $offset);
 
 		$linkResources = array_pad(array(), count($base), $cr);
@@ -737,17 +755,17 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief processes an LDAP paged search operation
-	 * @param $sr the array containing the LDAP search resources
-	 * @param $filter the LDAP filter for the search
-	 * @param $base an array containing the LDAP subtree(s) that shall be searched
-	 * @param $iFoundItems number of results in the search operation
-	 * @param $limit maximum results to be counted
-	 * @param $offset a starting point
-	 * @param $pagedSearchOK whether a paged search has been executed
-	 * @param boolean $skipHandling required for paged search when cookies to
+	 * processes an LDAP paged search operation
+	 * @param array $sr the array containing the LDAP search resources
+	 * @param string $filter the LDAP filter for the search
+	 * @param array $base an array containing the LDAP subtree(s) that shall be searched
+	 * @param int $iFoundItems number of results in the search operation
+	 * @param int $limit maximum results to be counted
+	 * @param int $offset a starting point
+	 * @param bool $pagedSearchOK whether a paged search has been executed
+	 * @param bool $skipHandling required for paged search when cookies to
 	 * prior results need to be gained
-	 * @returns array with the search result as first value and pagedSearchOK as
+	 * @return array|false array with the search result as first value and pagedSearchOK as
 	 * second | false if not successful
 	 */
 	private function processPagedSearchStatus($sr, $filter, $base, $iFoundItems, $limit, $offset, $pagedSearchOK, $skipHandling) {
@@ -778,16 +796,16 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief executes an LDAP search, but counts the results only
+	 * executes an LDAP search, but counts the results only
 	 * @param string $filter the LDAP filter for the search
-	 * @param $base an array containing the LDAP subtree(s) that shall be searched
-	 * @param $attr optional, array, one or more attributes that shall be
+	 * @param array $base an array containing the LDAP subtree(s) that shall be searched
+	 * @param string|string[] $attr optional, array, one or more attributes that shall be
 	 * retrieved. Results will according to the order in the array.
-	 * @param $limit optional, maximum results to be counted
-	 * @param $offset optional, a starting point
-	 * @param $skipHandling indicates whether the pages search operation is
+	 * @param int $limit optional, maximum results to be counted
+	 * @param int $offset optional, a starting point
+	 * @param bool $skipHandling indicates whether the pages search operation is
 	 * completed
-	 * @returns int | false if the search could not be initialized
+	 * @return int|false Integer or false if the search could not be initialized
 	 *
 	 */
 	private function count($filter, $base, $attr = null, $limit = null, $offset = null, $skipHandling = false) {
@@ -799,7 +817,7 @@ class Access extends LDAPUtility {
 
 		$counter = 0;
 		$count = null;
-		$cr = $this->connection->getConnectionResource();
+		$this->connection->getConnectionResource();
 
 		do {
 			$continue = false;
@@ -821,10 +839,15 @@ class Access extends LDAPUtility {
 		return $counter;
 	}
 
-	private function countEntriesInSearchResults($searchResults, $limit,
-																&$hasHitLimit) {
+	/**
+	 * @param array $searchResults
+	 * @param int $limit
+	 * @param bool $hasHitLimit
+	 * @return int
+	 */
+	private function countEntriesInSearchResults($searchResults, $limit, &$hasHitLimit) {
 		$cr = $this->connection->getConnectionResource();
-		$count = 0;
+		$counter = 0;
 
 		foreach($searchResults as $res) {
 			$count = intval($this->ldap->countEntries($cr, $res));
@@ -838,14 +861,14 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief executes an LDAP search
-	 * @param $filter the LDAP filter for the search
-	 * @param $base an array containing the LDAP subtree(s) that shall be searched
-	 * @param $attr optional, array, one or more attributes that shall be
-	 * retrieved. Results will according to the order in the array.
-	 * @returns array with the search result
-	 *
 	 * Executes an LDAP search
+	 * @param string $filter the LDAP filter for the search
+	 * @param array $base an array containing the LDAP subtree(s) that shall be searched
+	 * @param string|string[] $attr optional, array, one or more attributes that shall be
+	 * @param int $limit
+	 * @param int $offset
+	 * @param bool $skipHandling
+	 * @return array with the search result
 	 */
 	private function search($filter, $base, $attr = null, $limit = null, $offset = null, $skipHandling = false) {
 		$search = $this->executeSearch($filter, $base, $attr, $limit, $offset);
@@ -873,8 +896,8 @@ class Access extends LDAPUtility {
 		}
 
 		$findings = array();
-		foreach($sr as $key => $res) {
-		    $findings = array_merge($findings, $this->ldap->getEntries($cr	, $res ));
+		foreach($sr as $res) {
+			$findings = array_merge($findings, $this->ldap->getEntries($cr	, $res ));
 		}
 
 		$this->processPagedSearchStatus($sr, $filter, $base, $findings['count'],
@@ -889,9 +912,9 @@ class Access extends LDAPUtility {
 
 		if(!is_null($attr)) {
 			$selection = array();
-			$multiarray = false;
+			$multiArray = false;
 			if(count($attr) > 1) {
-				$multiarray = true;
+				$multiArray = true;
 				$i = 0;
 			}
 			foreach($findings as $item) {
@@ -900,7 +923,7 @@ class Access extends LDAPUtility {
 				}
 				$item = \OCP\Util::mb_array_change_key_case($item, MB_CASE_LOWER, 'UTF-8');
 
-				if($multiarray) {
+				if($multiArray) {
 					foreach($attr as $key) {
 						$key = mb_strtolower($key, 'UTF-8');
 						if(isset($item[$key])) {
@@ -931,7 +954,7 @@ class Access extends LDAPUtility {
 			$findings = $selection;
 		}
 		//we slice the findings, when
-		//a) paged search insuccessful, though attempted
+		//a) paged search unsuccessful, though attempted
 		//b) no paged search, but limit set
 		if((!$this->getPagedSearchResultState()
 			&& $pagedSearchOK)
@@ -945,28 +968,32 @@ class Access extends LDAPUtility {
 		return $findings;
 	}
 
+	/**
+	 * @param string $name
+	 * @return bool|mixed|string
+	 */
 	public function sanitizeUsername($name) {
 		if($this->connection->ldapIgnoreNamingRules) {
 			return $name;
 		}
 
-		// Translitaration
-		//latin characters to ASCII
+		// Transliteration
+		// latin characters to ASCII
 		$name = iconv('UTF-8', 'ASCII//TRANSLIT', $name);
 
-		//REPLACEMENTS
+		// Replacements
 		$name = \OCP\Util::mb_str_replace(' ', '_', $name, 'UTF-8');
 
-		//every remaining unallowed characters will be removed
+		// Every remaining disallowed characters will be removed
 		$name = preg_replace('/[^a-zA-Z0-9_.@-]/u', '', $name);
 
 		return $name;
 	}
 
 	/**
-	* @brief escapes (user provided) parts for LDAP filter
+	* escapes (user provided) parts for LDAP filter
 	* @param string $input, the provided value
-	* @return the escaped string
+	* @return string the escaped string
 	*/
 	public function escapeFilterPart($input) {
 		$search  = array('*', '\\', '(', ')');
@@ -975,49 +1002,43 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief combines the input filters with AND
-	 * @param $filters array, the filters to connect
-	 * @returns the combined filter
-	 *
-	 * Combines Filter arguments with AND
+	 * combines the input filters with AND
+	 * @param string[] $filters the filters to connect
+	 * @return string the combined filter
 	 */
 	public function combineFilterWithAnd($filters) {
 		return $this->combineFilter($filters, '&');
 	}
 
 	/**
-	 * @brief combines the input filters with AND
-	 * @param $filters array, the filters to connect
-	 * @returns the combined filter
-	 *
-	 * Combines Filter arguments with AND
+	 * combines the input filters with AND
+	 * @param string[] $filters the filters to connect
+	 * @return string the combined filter
 	 */
 	public function combineFilterWithOr($filters) {
 		return $this->combineFilter($filters, '|');
 	}
 
 	/**
-	 * @brief combines the input filters with given operator
-	 * @param $filters array, the filters to connect
+	 * combines the input filters with given operator
+	 * @param string[] $filters the filters to connect
 	 * @param string $operator either & or |
-	 * @returns the combined filter
-	 *
-	 * Combines Filter arguments with AND
+	 * @return string the combined filter
 	 */
 	private function combineFilter($filters, $operator) {
 		$combinedFilter = '('.$operator;
 		foreach($filters as $filter) {
-		    if(!empty($filter) && $filter[0] !== '(') {
+			if(!empty($filter) && $filter[0] !== '(') {
 				$filter = '('.$filter.')';
-		    }
-		    $combinedFilter.=$filter;
+			}
+			$combinedFilter.=$filter;
 		}
 		$combinedFilter.=')';
 		return $combinedFilter;
 	}
 
 	/**
-	 * @brief creates a filter part for to perfrom search for users
+	 * creates a filter part for to perform search for users
 	 * @param string $search the search term
 	 * @return string the final filter part to use in LDAP searches
 	 */
@@ -1028,7 +1049,7 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief creates a filter part for to perfrom search for groups
+	 * creates a filter part for to perform search for groups
 	 * @param string $search the search term
 	 * @return string the final filter part to use in LDAP searches
 	 */
@@ -1039,11 +1060,12 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief creates a filter part for searches
+	 * creates a filter part for searches
 	 * @param string $search the search term
+	 * @param string[]|null $searchAttributes
 	 * @param string $fallbackAttribute a fallback attribute in case the user
 	 * did not define search attributes. Typically the display name attribute.
-	 * @returns string the final filter part to use in LDAP searches
+	 * @return string the final filter part to use in LDAP searches
 	 */
 	private function getFilterPartForSearch($search, $searchAttributes, $fallbackAttribute) {
 		$filter = array();
@@ -1065,7 +1087,9 @@ class Access extends LDAPUtility {
 	}
 
 	/**
+	 * @param string $name
 	 * @param string $password
+	 * @return bool
 	 */
 	public function areCredentialsValid($name, $password) {
 		$name = $this->DNasBaseParameter($name);
@@ -1083,10 +1107,11 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief auto-detects the directory's UUID attribute
-	 * @param $dn a known DN used to check against
-	 * @param $force the detection should be run, even if it is not set to auto
-	 * @returns true on success, false otherwise
+	 * auto-detects the directory's UUID attribute
+	 * @param string $dn a known DN used to check against
+	 * @param bool $isUser
+	 * @param bool $force the detection should be run, even if it is not set to auto
+	 * @return bool true on success, false otherwise
 	 */
 	private function detectUuidAttribute($dn, $isUser = true, $force = false) {
 		if($isUser) {
@@ -1106,7 +1131,7 @@ class Access extends LDAPUtility {
 			return true;
 		}
 
-		//for now, supported attributes are entryUUID, nsuniqueid, objectGUID, ipaUniqueID
+		// for now, supported attributes are entryUUID, nsuniqueid, objectGUID, ipaUniqueID
 		$testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid', 'ipauniqueid');
 
 		foreach($testAttributes as $attribute) {
@@ -1126,6 +1151,11 @@ class Access extends LDAPUtility {
 		return false;
 	}
 
+	/**
+	 * @param string $dn
+	 * @param bool $isUser
+	 * @return array|bool|false
+	 */
 	public function getUUID($dn, $isUser = true) {
 		if($isUser) {
 			$uuidAttr     = 'ldapUuidUserAttribute';
@@ -1153,12 +1183,10 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief converts a binary ObjectGUID into a string representation
-	 * @param $oguid the ObjectGUID in it's binary form as retrieved from AD
-	 * @returns String
-	 *
 	 * converts a binary ObjectGUID into a string representation
-	 * http://www.php.net/manual/en/function.ldap-get-values-len.php#73198
+	 * @param string $oguid the ObjectGUID in it's binary form as retrieved from AD
+	 * @return string
+	 * @link http://www.php.net/manual/en/function.ldap-get-values-len.php#73198
 	 */
 	private function convertObjectGUID2Str($oguid) {
 		$hex_guid = bin2hex($oguid);
@@ -1181,25 +1209,24 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief converts a stored DN so it can be used as base parameter for LDAP queries
-	 * @param $dn the DN
-	 * @returns String
-	 *
-	 * converts a stored DN so it can be used as base parameter for LDAP queries
-	 * internally we store them for usage in LDAP filters
+	 * converts a stored DN so it can be used as base parameter for LDAP queries, internally we store them for usage in LDAP filters
+	 * @param string $dn the DN
+	 * @return string
 	 */
 	private function DNasBaseParameter($dn) {
 		return str_ireplace('\\5c', '\\', $dn);
 	}
 
 	/**
-	 * @brief checks if the given DN is part of the given base DN(s)
-	 * @param $dn the DN
-	 * @param $bases array containing the allowed base DN or DNs
-	 * @returns Boolean
+	 * checks if the given DN is part of the given base DN(s)
+	 * @param string $dn the DN
+	 * @param string[] $bases array containing the allowed base DN or DNs
+	 * @return bool
 	 */
 	private function isDNPartOfBase($dn, $bases) {
+		$belongsToBase = false;
 		$bases = $this->sanitizeDN($bases);
+
 		foreach($bases as $base) {
 			$belongsToBase = true;
 			if(mb_strripos($dn, $base, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($base, 'UTF-8'))) {
@@ -1213,12 +1240,12 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief get a cookie for the next LDAP paged search
-	 * @param $base a string with the base DN for the search
-	 * @param $filter the search filter to identify the correct search
-	 * @param $limit the limit (or 'pageSize'), to identify the correct search well
-	 * @param $offset the offset for the new search to identify the correct search really good
-	 * @returns string containing the key or empty if none is cached
+	 * get a cookie for the next LDAP paged search
+	 * @param string $base a string with the base DN for the search
+	 * @param string $filter the search filter to identify the correct search
+	 * @param int $limit the limit (or 'pageSize'), to identify the correct search well
+	 * @param int $offset the offset for the new search to identify the correct search really good
+	 * @return string containing the key or empty if none is cached
 	 */
 	private function getPagedResultCookie($base, $filter, $limit, $offset) {
 		if($offset === 0) {
@@ -1226,10 +1253,10 @@ class Access extends LDAPUtility {
 		}
 		$offset -= $limit;
 		//we work with cache here
-		$cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' . intval($limit) . '-' . intval($offset);
+		$cacheKey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' . intval($limit) . '-' . intval($offset);
 		$cookie = '';
-		if(isset($this->cookies[$cachekey])) {
-			$cookie = $this->cookies[$cachekey];
+		if(isset($this->cookies[$cacheKey])) {
+			$cookie = $this->cookies[$cacheKey];
 			if(is_null($cookie)) {
 				$cookie = '';
 			}
@@ -1238,23 +1265,23 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief set a cookie for LDAP paged search run
-	 * @param $base a string with the base DN for the search
-	 * @param $filter the search filter to identify the correct search
-	 * @param $limit the limit (or 'pageSize'), to identify the correct search well
-	 * @param $offset the offset for the run search to identify the correct search really good
-	 * @param $cookie string containing the cookie returned by ldap_control_paged_result_response
+	 * set a cookie for LDAP paged search run
+	 * @param string $base a string with the base DN for the search
+	 * @param string $filter the search filter to identify the correct search
+	 * @param int $limit the limit (or 'pageSize'), to identify the correct search well
+	 * @param int $offset the offset for the run search to identify the correct search really good
+	 * @param string $cookie string containing the cookie returned by ldap_control_paged_result_response
 	 * @return void
 	 */
 	private function setPagedResultCookie($base, $filter, $limit, $offset, $cookie) {
 		if(!empty($cookie)) {
-			$cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' .intval($limit) . '-' . intval($offset);
-			$this->cookies[$cachekey] = $cookie;
+			$cacheKey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' .intval($limit) . '-' . intval($offset);
+			$this->cookies[$cacheKey] = $cookie;
 		}
 	}
 
 	/**
-	 * @brief check wether the most recent paged search was successful. It flushed the state var. Use it always after a possible paged search.
+	 * Check whether the most recent paged search was successful. It flushed the state var. Use it always after a possible paged search.
 	 * @return boolean|null true on success, null or false otherwise
 	 */
 	public function getPagedSearchResultState() {
@@ -1263,15 +1290,14 @@ class Access extends LDAPUtility {
 		return $result;
 	}
 
-
 	/**
-	 * @brief prepares a paged search, if possible
-	 * @param $filter the LDAP filter for the search
-	 * @param $bases an array containing the LDAP subtree(s) that shall be searched
-	 * @param $attr optional, when a certain attribute shall be filtered outside
-	 * @param $limit
-	 * @param $offset
-	 *
+	 * Prepares a paged search, if possible
+	 * @param string $filter the LDAP filter for the search
+	 * @param string[] $bases an array containing the LDAP subtree(s) that shall be searched
+	 * @param string[] $attr optional, when a certain attribute shall be filtered outside
+	 * @param int $limit
+	 * @param int $offset
+	 * @return bool|true
 	 */
 	private function initPagedSearch($filter, $bases, $attr, $limit, $offset) {
 		$pagedSearchOK = false;
@@ -1287,8 +1313,9 @@ class Access extends LDAPUtility {
 				$cookie = $this->getPagedResultCookie($base, $filter, $limit, $offset);
 				if(empty($cookie) && ($offset > 0)) {
 					// no cookie known, although the offset is not 0. Maybe cache run out. We need
-					// to start all over *sigh* (btw, Dear Reader, did you need LDAP paged
+					// to start all over *sigh* (btw, Dear Reader, did you know LDAP paged
 					// searching was designed by MSFT?)
+					// 		Lukas: No, but thanks to reading that source I finally know!
 					$reOffset = ($offset - $limit) < 0 ? 0 : $offset - $limit;
 					//a bit recursive, $offset of 0 is the exit
 					\OCP\Util::writeLog('user_ldap', 'Looking for cookie L/O '.$limit.'/'.$reOffset, \OCP\Util::INFO);
diff --git a/apps/user_ldap/lib/backendutility.php b/apps/user_ldap/lib/backendutility.php
index 815757a1a1..c94366ce01 100644
--- a/apps/user_ldap/lib/backendutility.php
+++ b/apps/user_ldap/lib/backendutility.php
@@ -29,8 +29,8 @@ abstract class BackendUtility {
 	protected $access;
 
 	/**
-	 * @brief constructor, make sure the subclasses call this one!
-	 * @param $access an instance of Access for LDAP interaction
+	 * constructor, make sure the subclasses call this one!
+	 * @param Access $access an instance of Access for LDAP interaction
 	 */
 	public function __construct(Access $access) {
 		$this->access = $access;
diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php
index c9ed1e648a..9c455929b4 100644
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/configuration.php
@@ -82,35 +82,47 @@ class Configuration {
 
 	/**
 	 * @param string $configPrefix
+	 * @param bool $autoRead
 	 */
-	public function __construct($configPrefix, $autoread = true) {
+	public function __construct($configPrefix, $autoRead = true) {
 		$this->configPrefix = $configPrefix;
-		if($autoread) {
+		if($autoRead) {
 			$this->readConfiguration();
 		}
 	}
 
+	/**
+	 * @param string $name
+	 * @return mixed|void
+	 */
 	public function __get($name) {
 		if(isset($this->config[$name])) {
 			return $this->config[$name];
 		}
 	}
 
+	/**
+	 * @param string $name
+	 * @param mixed $value
+	 */
 	public function __set($name, $value) {
 		$this->setConfiguration(array($name => $value));
 	}
 
+	/**
+	 * @return array
+	 */
 	public function getConfiguration() {
 		return $this->config;
 	}
 
 	/**
-	 * @brief set LDAP configuration with values delivered by an array, not read
+	 * set LDAP configuration with values delivered by an array, not read
 	 * from configuration. It does not save the configuration! To do so, you
 	 * must call saveConfiguration afterwards.
-	 * @param $config array that holds the config parameters in an associated
+	 * @param array $config array that holds the config parameters in an associated
 	 * array
-	 * @param &$applied optional; array where the set fields will be given to
+	 * @param array &$applied optional; array where the set fields will be given to
 	 * @return false|null
 	 */
 	public function setConfiguration($config, &$applied = null) {
@@ -119,11 +131,11 @@ class Configuration {
 		}
 
 		$cta = $this->getConfigTranslationArray();
-		foreach($config as $inputkey => $val) {
-			if(strpos($inputkey, '_') !== false && array_key_exists($inputkey, $cta)) {
-				$key = $cta[$inputkey];
-			} elseif(array_key_exists($inputkey, $this->config)) {
-				$key = $inputkey;
+		foreach($config as $inputKey => $val) {
+			if(strpos($inputKey, '_') !== false && array_key_exists($inputKey, $cta)) {
+				$key = $cta[$inputKey];
+			} elseif(array_key_exists($inputKey, $this->config)) {
+				$key = $inputKey;
 			} else {
 				continue;
 			}
@@ -150,7 +162,7 @@ class Configuration {
 			}
 			$this->$setMethod($key, $val);
 			if(is_array($applied)) {
-				$applied[] = $inputkey;
+				$applied[] = $inputKey;
 			}
 		}
 
@@ -164,7 +176,7 @@ class Configuration {
 					//some are determined
 					continue;
 				}
-				$dbkey = $cta[$key];
+				$dbKey = $cta[$key];
 				switch($key) {
 					case 'ldapBase':
 					case 'ldapBaseUsers':
@@ -180,7 +192,7 @@ class Configuration {
 						break;
 					case 'ldapIgnoreNamingRules':
 						$readMethod = 'getSystemValue';
-						$dbkey = $key;
+						$dbKey = $key;
 						break;
 					case 'ldapAgentPassword':
 						$readMethod = 'getPwd';
@@ -193,14 +205,14 @@ class Configuration {
 						$readMethod = 'getValue';
 						break;
 				}
-				$this->config[$key] = $this->$readMethod($dbkey);
+				$this->config[$key] = $this->$readMethod($dbKey);
 			}
 			$this->configRead = true;
 		}
 	}
 
 	/**
-	 * @brief saves the current Configuration in the database
+	 * saves the current Configuration in the database
 	 */
 	public function saveConfiguration() {
 		$cta = array_flip($this->getConfigTranslationArray());
@@ -237,8 +249,12 @@ class Configuration {
 		}
 	}
 
-	protected function getMultiLine($varname) {
-		$value = $this->getValue($varname);
+	/**
+	 * @param string $varName
+	 * @return array|string
+	 */
+	protected function getMultiLine($varName) {
+		$value = $this->getValue($varName);
 		if(empty($value)) {
 			$value = '';
 		} else {
@@ -248,7 +264,11 @@ class Configuration {
 		return $value;
 	}
 
-	protected function setMultiLine($varname, $value) {
+	/**
+	 * @param string $varName
+	 * @param array|string $value
+	 */
+	protected function setMultiLine($varName, $value) {
 		if(empty($value)) {
 			$value = '';
 		} else if (!is_array($value)) {
@@ -258,44 +278,69 @@ class Configuration {
 			}
 		}
 
-		$this->setValue($varname, $value);
+		$this->setValue($varName, $value);
 	}
 
-	protected function getPwd($varname) {
-		return base64_decode($this->getValue($varname));
+	/**
+	 * @param string $varName
+	 * @return string
+	 */
+	protected function getPwd($varName) {
+		return base64_decode($this->getValue($varName));
 	}
 
-	protected function getLcValue($varname) {
-		return mb_strtolower($this->getValue($varname), 'UTF-8');
+	/**
+	 * @param string $varName
+	 * @return string
+	 */
+	protected function getLcValue($varName) {
+		return mb_strtolower($this->getValue($varName), 'UTF-8');
 	}
 
-	protected function getSystemValue($varname) {
+	/**
+	 * @param string $varName
+	 * @return string
+	 */
+	protected function getSystemValue($varName) {
 		//FIXME: if another system value is added, softcode the default value
-		return \OCP\Config::getSystemValue($varname, false);
+		return \OCP\Config::getSystemValue($varName, false);
 	}
 
-	protected function getValue($varname) {
+	/**
+	 * @param string $varName
+	 * @return string
+	 */
+	protected function getValue($varName) {
 		static $defaults;
 		if(is_null($defaults)) {
 			$defaults = $this->getDefaults();
 		}
 		return \OCP\Config::getAppValue('user_ldap',
-										$this->configPrefix.$varname,
-										$defaults[$varname]);
+										$this->configPrefix.$varName,
+										$defaults[$varName]);
 	}
 
-	protected function setValue($varname, $value) {
-		$this->config[$varname] = $value;
+	/**
+	 * @param string $varName
+	 * @param mixed $value
+	 */
+	protected function setValue($varName, $value) {
+		$this->config[$varName] = $value;
 	}
 
-	protected function saveValue($varname, $value) {
+	/**
+	 * @param string $varName
+	 * @param string $value
+	 * @return bool
+	 */
+	protected function saveValue($varName, $value) {
 		return \OCP\Config::setAppValue('user_ldap',
-										$this->configPrefix.$varname,
+										$this->configPrefix.$varName,
 										$value);
 	}
 
 	/**
-	 * @returns an associative array with the default values. Keys are correspond
+	 * @return array an associative array with the default values. Keys are correspond
 	 * to config-value entries in the database table
 	 */
 	public function getDefaults() {
@@ -350,7 +395,7 @@ class Configuration {
 	}
 
 	/**
-	 * @return returns an array that maps internal variable names to database fields
+	 * @return array that maps internal variable names to database fields
 	 */
 	public function getConfigTranslationArray() {
 		//TODO: merge them into one representation
@@ -403,4 +448,4 @@ class Configuration {
 		return $array;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 173c4ebcc2..52f6c5ceb1 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -42,9 +42,10 @@ class Connection extends LDAPUtility {
 	protected $doNotValidate = false;
 
 	/**
-	 * @brief Constructor
-	 * @param $configPrefix a string with the prefix for the configkey column (appconfig table)
-	 * @param $configID a string with the value for the appid column (appconfig table) or null for on-the-fly connections
+	 * Constructor
+	 * @param ILDAPWrapper $ldap
+	 * @param string $configPrefix a string with the prefix for the configkey column (appconfig table)
+	 * @param string $configID a string with the value for the appid column (appconfig table) or null for on-the-fly connections
 	 */
 	public function __construct(ILDAPWrapper $ldap, $configPrefix = '', $configID = 'user_ldap') {
 		parent::__construct($ldap);
@@ -56,7 +57,7 @@ class Connection extends LDAPUtility {
 		if($memcache->isAvailable()) {
 			$this->cache = $memcache->create();
 		} else {
-			$this->cache = \OC_Cache::getGlobalCache();
+			$this->cache = \OC\Cache::getGlobalCache();
 		}
 		$this->hasPagedResultSupport =
 			$this->ldap->hasPagedResultSupport();
@@ -72,7 +73,7 @@ class Connection extends LDAPUtility {
 	}
 
 	/**
-	 * @brief defines behaviour when the instance is cloned
+	 * defines behaviour when the instance is cloned
 	 */
 	public function __clone() {
 		//a cloned instance inherits the connection resource. It may use it,
@@ -82,6 +83,10 @@ class Connection extends LDAPUtility {
 												 !is_null($this->configID));
 	}
 
+	/**
+	 * @param string $name
+	 * @return bool|mixed|void
+	 */
 	public function __get($name) {
 		if(!$this->configured) {
 			$this->readConfiguration();
@@ -94,6 +99,10 @@ class Connection extends LDAPUtility {
 		return $this->configuration->$name;
 	}
 
+	/**
+	 * @param string $name
+	 * @param mixed $value
+	 */
 	public function __set($name, $value) {
 		$this->doNotValidate = false;
 		$before = $this->configuration->$name;
@@ -108,10 +117,8 @@ class Connection extends LDAPUtility {
 	}
 
 	/**
-	 * @brief initializes the LDAP backend
-	 * @param $force read the config settings no matter what
-	 *
 	 * initializes the LDAP backend
+	 * @param bool $force read the config settings no matter what
 	 */
 	public function init($force = false) {
 		$this->readConfiguration($force);
@@ -136,6 +143,7 @@ class Connection extends LDAPUtility {
 
 	/**
 	 * @param string|null $key
+	 * @return string
 	 */
 	private function getCacheKey($key) {
 		$prefix = 'LDAP-'.$this->configID.'-'.$this->configPrefix.'-';
@@ -147,6 +155,7 @@ class Connection extends LDAPUtility {
 
 	/**
 	 * @param string $key
+	 * @return mixed|null
 	 */
 	public function getFromCache($key) {
 		if(!$this->configured) {
@@ -166,6 +175,7 @@ class Connection extends LDAPUtility {
 
 	/**
 	 * @param string $key
+	 * @return bool
 	 */
 	public function isCached($key) {
 		if(!$this->configured) {
@@ -180,6 +190,7 @@ class Connection extends LDAPUtility {
 
 	/**
 	 * @param string $key
+	 * @param mixed $value
 	 */
 	public function writeToCache($key, $value) {
 		if(!$this->configured) {
@@ -199,8 +210,8 @@ class Connection extends LDAPUtility {
 	}
 
 	/**
-	 * @brief Caches the general LDAP configuration.
-	 * @param $force optional. true, if the re-read should be forced. defaults
+	 * Caches the general LDAP configuration.
+	 * @param bool $force optional. true, if the re-read should be forced. defaults
 	 * to false.
 	 * @return null
 	 */
@@ -212,9 +223,9 @@ class Connection extends LDAPUtility {
 	}
 
 	/**
-	 * @brief set LDAP configuration with values delivered by an array, not read from configuration
-	 * @param $config array that holds the config parameters in an associated array
-	 * @param &$setParameters optional; array where the set fields will be given to
+	 * set LDAP configuration with values delivered by an array, not read from configuration
+	 * @param array $config array that holds the config parameters in an associated array
+	 * @param array &$setParameters optional; array where the set fields will be given to
 	 * @return boolean true if config validates, false otherwise. Check with $setParameters for detailed success on single parameters
 	 */
 	public function setConfiguration($config, &$setParameters = null) {
@@ -232,7 +243,7 @@ class Connection extends LDAPUtility {
 	}
 
 	/**
-	 * @brief saves the current Configuration in the database and empties the
+	 * saves the current Configuration in the database and empties the
 	 * cache
 	 * @return null
 	 */
@@ -242,7 +253,7 @@ class Connection extends LDAPUtility {
 	}
 
 	/**
-	 * @brief get the current LDAP configuration
+	 * get the current LDAP configuration
 	 * @return array
 	 */
 	public function getConfiguration() {
@@ -278,7 +289,7 @@ class Connection extends LDAPUtility {
 	private function doSoftValidation() {
 		//if User or Group Base are not set, take over Base DN setting
 		foreach(array('ldapBaseUsers', 'ldapBaseGroups') as $keyBase) {
-		    $val = $this->configuration->$keyBase;
+			$val = $this->configuration->$keyBase;
 			if(empty($val)) {
 				$obj = strpos('Users', $keyBase) !== false ? 'Users' : 'Groups';
 				\OCP\Util::writeLog('user_ldap',
@@ -326,9 +337,9 @@ class Connection extends LDAPUtility {
 		}
 
 		//make sure empty search attributes are saved as simple, empty array
-		$sakeys = array('ldapAttributesForUserSearch',
+		$saKeys = array('ldapAttributesForUserSearch',
 						'ldapAttributesForGroupSearch');
-		foreach($sakeys as $key) {
+		foreach($saKeys as $key) {
 			$val = $this->configuration->$key;
 			if(is_array($val) && count($val) === 1 && empty($val[0])) {
 				$this->configuration->$key = array();
@@ -345,6 +356,9 @@ class Connection extends LDAPUtility {
 		}
 	}
 
+	/**
+	 * @return bool
+	 */
 	private function doCriticalValidation() {
 		$configurationOK = true;
 		$errorStr = 'Configuration Error (prefix '.
@@ -419,8 +433,8 @@ class Connection extends LDAPUtility {
 	}
 
 	/**
-	 * @brief Validates the user specified configuration
-	 * @returns true if configuration seems OK, false otherwise
+	 * Validates the user specified configuration
+	 * @return bool true if configuration seems OK, false otherwise
 	 */
 	private function validateConfiguration() {
 
@@ -435,8 +449,8 @@ class Connection extends LDAPUtility {
 		// necessary, but advisable. If left empty, give an info message
 		$this->doSoftValidation();
 
-		//second step: critical checks. If left empty or filled wrong, set as
-		//unconfigured and give a warning.
+		//second step: critical checks. If left empty or filled wrong, mark as
+		//not configured and give a warning.
 		return $this->doCriticalValidation();
 	}
 
@@ -508,12 +522,17 @@ class Connection extends LDAPUtility {
 		}
 	}
 
+	/**
+	 * @param string $host
+	 * @param string $port
+	 * @return false|void
+	 */
 	private function doConnect($host, $port) {
 		if(empty($host)) {
 			return false;
 		}
 		if(strpos($host, '://') !== false) {
-			//ldap_connect ignores port paramater when URLs are passed
+			//ldap_connect ignores port parameter when URLs are passed
 			$host .= ':' . $port;
 		}
 		$this->ldapConnectionRes = $this->ldap->connect($host, $port);
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index b5955cb2ab..37caedc625 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -26,8 +26,8 @@ namespace OCA\user_ldap\lib;
 class Helper {
 
 	/**
-	 * @brief returns prefixes for each saved LDAP/AD server configuration.
-	 * @param bool optional, whether only active configuration shall be
+	 * returns prefixes for each saved LDAP/AD server configuration.
+	 * @param bool $activeConfigurations optional, whether only active configuration shall be
 	 * retrieved, defaults to false
 	 * @return array with a list of the available prefixes
 	 *
@@ -79,8 +79,8 @@ class Helper {
 
 	/**
 	 *
-	 * @brief determines the host for every configured connection
-	 * @return an array with configprefix as keys
+	 * determines the host for every configured connection
+	 * @return array an array with configprefix as keys
 	 *
 	 */
 	static public function getServerConfigurationHosts() {
@@ -106,8 +106,8 @@ class Helper {
 	}
 
 	/**
-	 * @brief deletes a given saved LDAP/AD server configuration.
-	 * @param string the configuration prefix of the config to delete
+	 * deletes a given saved LDAP/AD server configuration.
+	 * @param string $prefix the configuration prefix of the config to delete
 	 * @return bool true on success, false otherwise
 	 */
 	static public function deleteServerConfiguration($prefix) {
@@ -148,7 +148,7 @@ class Helper {
 	 * Truncate's the given mapping table
 	 *
 	 * @param string $mapping either 'user' or 'group'
-	 * @return boolean true on success, false otherwise
+	 * @return bool true on success, false otherwise
 	 */
 	static public function clearMapping($mapping) {
 		if($mapping === 'user') {
@@ -176,9 +176,9 @@ class Helper {
 	}
 
 	/**
-	 * @brief extractsthe domain from a given URL
-	 * @param $url the URL
-	 * @return mixed, domain as string on success, false otherwise
+	 * extractsthe domain from a given URL
+	 * @param string $url the URL
+	 * @return string|false domain as string on success, false otherwise
 	 */
 	static public function getDomainFromURL($url) {
 		$uinfo = parse_url($url);
diff --git a/apps/user_ldap/lib/ildapwrapper.php b/apps/user_ldap/lib/ildapwrapper.php
index 017d554969..97ae081011 100644
--- a/apps/user_ldap/lib/ildapwrapper.php
+++ b/apps/user_ldap/lib/ildapwrapper.php
@@ -28,178 +28,178 @@ interface ILDAPWrapper {
 	//LDAP functions in use
 
 	/**
-	 * @brief Bind to LDAP directory
+	 * Bind to LDAP directory
 	 * @param resource $link LDAP link resource
-	 * @param $dn an RDN to log in with
-	 * @param $password the password
-	 * @return true on success, false otherwise
+	 * @param string $dn an RDN to log in with
+	 * @param string $password the password
+	 * @return bool true on success, false otherwise
 	 *
 	 * with $dn and $password as null a anonymous bind is attempted.
 	 */
 	public function bind($link, $dn, $password);
 
 	/**
-	 * @brief connect to an LDAP server
-	 * @param $host The host to connect to
-	 * @param $port The port to connect to
-	 * @return a link resource on success, otherwise false
+	 * connect to an LDAP server
+	 * @param string $host The host to connect to
+	 * @param string $port The port to connect to
+	 * @return mixed a link resource on success, otherwise false
 	 */
 	public function connect($host, $port);
 
 	/**
-	 * @brief Send LDAP pagination control
-	 * @param $link LDAP link resource
-	 * @param $pagesize number of results per page
-	 * @param boolean $isCritical Indicates whether the pagination is critical of not.
-	 * @param $cookie structure sent by LDAP server
-	 * @return true on success, false otherwise
+	 * Send LDAP pagination control
+	 * @param resource $link LDAP link resource
+	 * @param int $pageSize number of results per page
+	 * @param bool $isCritical Indicates whether the pagination is critical of not.
+	 * @param array $cookie structure sent by LDAP server
+	 * @return bool true on success, false otherwise
 	 */
-	public function controlPagedResult($link, $pagesize, $isCritical, $cookie);
+	public function controlPagedResult($link, $pageSize, $isCritical, $cookie);
 
 	/**
-	 * @brief Retrieve the LDAP pagination cookie
-	 * @param $link LDAP link resource
-	 * @param $result LDAP result resource
-	 * @param $cookie structure sent by LDAP server
-	 * @return boolean on success, false otherwise
+	 * Retrieve the LDAP pagination cookie
+	 * @param resource $link LDAP link resource
+	 * @param resource $result LDAP result resource
+	 * @param string $cookie structure sent by LDAP server
+	 * @return bool true on success, false otherwise
 	 *
 	 * Corresponds to ldap_control_paged_result_response
 	 */
 	public function controlPagedResultResponse($link, $result, &$cookie);
 
 	/**
-	 * @brief Count the number of entries in a search
-	 * @param $link LDAP link resource
-	 * @param $result LDAP result resource
-	 * @return mixed, number of results on success, false otherwise
+	 * Count the number of entries in a search
+	 * @param resource $link LDAP link resource
+	 * @param resource $result LDAP result resource
+	 * @return int|false number of results on success, false otherwise
 	 */
 	public function countEntries($link, $result);
 
 	/**
-	 * @brief Return the LDAP error number of the last LDAP command
-	 * @param $link LDAP link resource
-	 * @return error message as string
+	 * Return the LDAP error number of the last LDAP command
+	 * @param resource $link LDAP link resource
+	 * @return string error message as string
 	 */
 	public function errno($link);
 
 	/**
-	 * @brief Return the LDAP error message of the last LDAP command
-	 * @param $link LDAP link resource
-	 * @return error code as integer
+	 * Return the LDAP error message of the last LDAP command
+	 * @param resource $link LDAP link resource
+	 * @return int error code as integer
 	 */
 	public function error($link);
 
 	/**
-	 * @brief Return first result id
-	 * @param $link LDAP link resource
-	 * @param $result LDAP result resource
-	 * @return an LDAP search result resource
+	 * Return first result id
+	 * @param resource $link LDAP link resource
+	 * @param resource $result LDAP result resource
+	 * @return Resource an LDAP search result resource
 	 * */
 	public function firstEntry($link, $result);
 
 	/**
-	 * @brief Get attributes from a search result entry
-	 * @param $link LDAP link resource
-	 * @param $result LDAP result resource
+	 * Get attributes from a search result entry
+	 * @param resource $link LDAP link resource
+	 * @param resource $result LDAP result resource
 	 * @return array containing the results, false on error
 	 * */
 	public function getAttributes($link, $result);
 
 	/**
-	 * @brief Get the DN of a result entry
-	 * @param $link LDAP link resource
-	 * @param $result LDAP result resource
+	 * Get the DN of a result entry
+	 * @param resource $link LDAP link resource
+	 * @param resource $result LDAP result resource
 	 * @return string containing the DN, false on error
 	 */
 	public function getDN($link, $result);
 
 	/**
-	 * @brief Get all result entries
-	 * @param $link LDAP link resource
-	 * @param $result LDAP result resource
+	 * Get all result entries
+	 * @param resource $link LDAP link resource
+	 * @param resource $result LDAP result resource
 	 * @return array containing the results, false on error
 	 */
 	public function getEntries($link, $result);
 
 	/**
-	 * @brief Return next result id
-	 * @param $link LDAP link resource
+	 * Return next result id
+	 * @param resource $link LDAP link resource
 	 * @param resource $result LDAP entry result resource
-	 * @return an LDAP search result resource
+	 * @return resource an LDAP search result resource
 	 * */
 	public function nextEntry($link, $result);
 
 	/**
-	 * @brief Read an entry
-	 * @param $link LDAP link resource
-	 * @param $baseDN The DN of the entry to read from
-	 * @param $filter An LDAP filter
-	 * @param $attr array of the attributes to read
-	 * @return an LDAP search result resource
+	 * Read an entry
+	 * @param resource $link LDAP link resource
+	 * @param array $baseDN The DN of the entry to read from
+	 * @param string $filter An LDAP filter
+	 * @param array $attr array of the attributes to read
+	 * @return resource an LDAP search result resource
 	 */
 	public function read($link, $baseDN, $filter, $attr);
 
 	/**
-	 * @brief Search LDAP tree
-	 * @param $link LDAP link resource
-	 * @param $baseDN The DN of the entry to read from
-	 * @param $filter An LDAP filter
-	 * @param $attr array of the attributes to read
-	 * @param $attrsonly optional, 1 if only attribute types shall be returned
-	 * @param $limit optional, limits the result entries
-	 * @return an LDAP search result resource, false on error
+	 * Search LDAP tree
+	 * @param resource $link LDAP link resource
+	 * @param string $baseDN The DN of the entry to read from
+	 * @param string $filter An LDAP filter
+	 * @param array $attr array of the attributes to read
+	 * @param int $attrsOnly optional, 1 if only attribute types shall be returned
+	 * @param int $limit optional, limits the result entries
+	 * @return resource|false an LDAP search result resource, false on error
 	 */
-	public function search($link, $baseDN, $filter, $attr, $attrsonly = 0, $limit = 0);
+	public function search($link, $baseDN, $filter, $attr, $attrsOnly = 0, $limit = 0);
 
 	/**
-	 * @brief Sets the value of the specified option to be $value
-	 * @param $link LDAP link resource
-	 * @param $option a defined LDAP Server option
-	 * @param integer $value the new value for the option
-	 * @return true on success, false otherwise
+	 * Sets the value of the specified option to be $value
+	 * @param resource $link LDAP link resource
+	 * @param string $option a defined LDAP Server option
+	 * @param int $value the new value for the option
+	 * @return bool true on success, false otherwise
 	 */
 	public function setOption($link, $option, $value);
 
 	/**
-	 * @brief establish Start TLS
-	 * @param $link LDAP link resource
-	 * @return true on success, false otherwise
+	 * establish Start TLS
+	 * @param resource $link LDAP link resource
+	 * @return bool true on success, false otherwise
 	 */
 	public function startTls($link);
 
 	/**
-	 * @brief Sort the result of a LDAP search
-	 * @param $link LDAP link resource
-	 * @param $result LDAP result resource
-	 * @param $sortfilter attribute to use a key in sort
+	 * Sort the result of a LDAP search
+	 * @param resource $link LDAP link resource
+	 * @param resource $result LDAP result resource
+	 * @param string $sortFilter attribute to use a key in sort
 	 */
-	public function sort($link, $result, $sortfilter);
+	public function sort($link, $result, $sortFilter);
 
 	/**
-	 * @brief Unbind from LDAP directory
+	 * Unbind from LDAP directory
 	 * @param resource $link LDAP link resource
-	 * @return true on success, false otherwise
+	 * @return bool true on success, false otherwise
 	 */
 	public function unbind($link);
 
-	//additional required methods in owncloud
+	//additional required methods in ownCloud
 
 	/**
-	 * @brief Checks whether the server supports LDAP
-	 * @return boolean if it the case, false otherwise
+	 * Checks whether the server supports LDAP
+	 * @return bool true if it the case, false otherwise
 	 * */
 	public function areLDAPFunctionsAvailable();
 
 	/**
-	 * @brief Checks whether PHP supports LDAP Paged Results
-	 * @return boolean if it the case, false otherwise
+	 * Checks whether PHP supports LDAP Paged Results
+	 * @return bool true if it the case, false otherwise
 	 * */
 	public function hasPagedResultSupport();
 
 	/**
-	 * @brief Checks whether the submitted parameter is a resource
-	 * @param $resource the resource variable to check
-	 * @return boolean if it is a resource, false otherwise
+	 * Checks whether the submitted parameter is a resource
+	 * @param resource $resource the resource variable to check
+	 * @return bool true if it is a resource, false otherwise
 	 */
 	public function isResource($resource);
 
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index 9b108da633..19c041e4db 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -33,6 +33,9 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
 		$this->interval = self::getRefreshInterval();
 	}
 
+	/**
+	 * @param mixed $argument
+	 */
 	public function run($argument){
 		Jobs::updateGroups();
 	}
@@ -57,11 +60,17 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
 		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Finished.', \OCP\Util::DEBUG);
 	}
 
+	/**
+	 * @return int
+	 */
 	static private function getRefreshInterval() {
 		//defaults to every hour
 		return \OCP\Config::getAppValue('user_ldap', 'bgjRefreshInterval', 3600);
 	}
 
+	/**
+	 * @param string[] $groups
+	 */
 	static private function handleKnownGroups($groups) {
 		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Dealing with known Groups.', \OCP\Util::DEBUG);
 		$query = \OCP\DB::prepare('
@@ -71,32 +80,35 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
 		');
 		foreach($groups as $group) {
 			//we assume, that self::$groupsFromDB has been retrieved already
-		    $knownUsers = unserialize(self::$groupsFromDB[$group]['owncloudusers']);
-		    $actualUsers = self::getGroupBE()->usersInGroup($group);
-		    $hasChanged = false;
-		    foreach(array_diff($knownUsers, $actualUsers) as $removedUser) {
-		        \OCP\Util::emitHook('OC_User', 'post_removeFromGroup', array('uid' => $removedUser, 'gid' => $group));
-		        \OCP\Util::writeLog('user_ldap',
+			$knownUsers = unserialize(self::$groupsFromDB[$group]['owncloudusers']);
+			$actualUsers = self::getGroupBE()->usersInGroup($group);
+			$hasChanged = false;
+			foreach(array_diff($knownUsers, $actualUsers) as $removedUser) {
+				\OCP\Util::emitHook('OC_User', 'post_removeFromGroup', array('uid' => $removedUser, 'gid' => $group));
+				\OCP\Util::writeLog('user_ldap',
 				'bgJ "updateGroups" – "'.$removedUser.'" removed from "'.$group.'".',
 				\OCP\Util::INFO);
-		        $hasChanged = true;
-		    }
-		    foreach(array_diff($actualUsers, $knownUsers) as $addedUser) {
-		        \OCP\Util::emitHook('OC_User', 'post_addToGroup', array('uid' => $addedUser, 'gid' => $group));
-		        \OCP\Util::writeLog('user_ldap',
+				$hasChanged = true;
+			}
+			foreach(array_diff($actualUsers, $knownUsers) as $addedUser) {
+				\OCP\Util::emitHook('OC_User', 'post_addToGroup', array('uid' => $addedUser, 'gid' => $group));
+				\OCP\Util::writeLog('user_ldap',
 				'bgJ "updateGroups" – "'.$addedUser.'" added to "'.$group.'".',
 				\OCP\Util::INFO);
-		        $hasChanged = true;
-		    }
-		    if($hasChanged) {
+				$hasChanged = true;
+			}
+			if($hasChanged) {
 				$query->execute(array(serialize($actualUsers), $group));
-		    }
+			}
 		}
 		\OCP\Util::writeLog('user_ldap',
 			'bgJ "updateGroups" – FINISHED dealing with known Groups.',
 			\OCP\Util::DEBUG);
 	}
 
+	/**
+	 * @param string[] $createdGroups
+	 */
 	static private function handleCreatedGroups($createdGroups) {
 		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with created Groups.', \OCP\Util::DEBUG);
 		$query = \OCP\DB::prepare('
@@ -109,13 +121,16 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
 				'bgJ "updateGroups" – new group "'.$createdGroup.'" found.',
 				\OCP\Util::INFO);
 			$users = serialize(self::getGroupBE()->usersInGroup($createdGroup));
-		    $query->execute(array($createdGroup, $users));
+			$query->execute(array($createdGroup, $users));
 		}
 		\OCP\Util::writeLog('user_ldap',
 			'bgJ "updateGroups" – FINISHED dealing with created Groups.',
 			\OCP\Util::DEBUG);
 	}
 
+	/**
+	 * @param string[] $removedGroups
+	 */
 	static private function handleRemovedGroups($removedGroups) {
 		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with removed groups.', \OCP\Util::DEBUG);
 		$query = \OCP\DB::prepare('
@@ -127,13 +142,16 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
 			\OCP\Util::writeLog('user_ldap',
 				'bgJ "updateGroups" – group "'.$removedGroup.'" was removed.',
 				\OCP\Util::INFO);
-		    $query->execute(array($removedGroup));
+			$query->execute(array($removedGroup));
 		}
 		\OCP\Util::writeLog('user_ldap',
 			'bgJ "updateGroups" – FINISHED dealing with removed groups.',
 			\OCP\Util::DEBUG);
 	}
 
+	/**
+	 * @return \OCA\user_ldap\GROUP_LDAP|\OCA\user_ldap\Group_Proxy
+	 */
 	static private function getGroupBE() {
 		if(!is_null(self::$groupBE)) {
 			return self::$groupBE;
@@ -152,6 +170,9 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
 		return self::$groupBE;
 	}
 
+	/**
+	 * @return array
+	 */
 	static private function getKnownGroups() {
 		if(is_array(self::$groupsFromDB)) {
 			return self::$groupsFromDB;
@@ -163,7 +184,7 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
 		$result = $query->execute()->fetchAll();
 		self::$groupsFromDB = array();
 		foreach($result as $dataset) {
-		    self::$groupsFromDB[$dataset['owncloudname']] = $dataset;
+			self::$groupsFromDB[$dataset['owncloudname']] = $dataset;
 		}
 
 		return self::$groupsFromDB;
diff --git a/apps/user_ldap/lib/ldap.php b/apps/user_ldap/lib/ldap.php
index d1ca91045b..2b20b2ab73 100644
--- a/apps/user_ldap/lib/ldap.php
+++ b/apps/user_ldap/lib/ldap.php
@@ -27,14 +27,31 @@ class LDAP implements ILDAPWrapper {
 	protected $curFunc = '';
 	protected $curArgs = array();
 
+	/**
+	 * @param resource $link
+	 * @param string $dn
+	 * @param string $password
+	 * @return bool|mixed
+	 */
 	public function bind($link, $dn, $password) {
 		return $this->invokeLDAPMethod('bind', $link, $dn, $password);
 	}
 
+	/**
+	 * @param string $host
+	 * @param string $port
+	 * @return mixed
+	 */
 	public function connect($host, $port) {
 		return $this->invokeLDAPMethod('connect', $host, $port);
 	}
 
+	/**
+	 * @param LDAP $link
+	 * @param LDAP $result
+	 * @param string $cookie
+	 * @return bool|LDAP
+	 */
 	public function controlPagedResultResponse($link, $result, &$cookie) {
 		$this->preFunctionCall('ldap_control_paged_result_response',
 			array($link, $result, $cookie));
@@ -44,70 +61,150 @@ class LDAP implements ILDAPWrapper {
 		return $result;
 	}
 
-	public function controlPagedResult($link, $pagesize, $isCritical, $cookie) {
-		return $this->invokeLDAPMethod('control_paged_result', $link, $pagesize,
+	/**
+	 * @param LDAP $link
+	 * @param int $pageSize
+	 * @param bool $isCritical
+	 * @param string $cookie
+	 * @return mixed|true
+	 */
+	public function controlPagedResult($link, $pageSize, $isCritical, $cookie) {
+		return $this->invokeLDAPMethod('control_paged_result', $link, $pageSize,
 										$isCritical, $cookie);
 	}
 
+	/**
+	 * @param LDAP $link
+	 * @param LDAP $result
+	 * @return mixed
+	 */
 	public function countEntries($link, $result) {
 		return $this->invokeLDAPMethod('count_entries', $link, $result);
 	}
 
+	/**
+	 * @param LDAP $link
+	 * @return mixed|string
+	 */
 	public function errno($link) {
 		return $this->invokeLDAPMethod('errno', $link);
 	}
 
+	/**
+	 * @param LDAP $link
+	 * @return int|mixed
+	 */
 	public function error($link) {
 		return $this->invokeLDAPMethod('error', $link);
 	}
 
+	/**
+	 * @param LDAP $link
+	 * @param LDAP $result
+	 * @return mixed
+	 */
 	public function firstEntry($link, $result) {
 		return $this->invokeLDAPMethod('first_entry', $link, $result);
 	}
 
+	/**
+	 * @param LDAP $link
+	 * @param LDAP $result
+	 * @return array|mixed
+	 */
 	public function getAttributes($link, $result) {
 		return $this->invokeLDAPMethod('get_attributes', $link, $result);
 	}
 
+	/**
+	 * @param LDAP $link
+	 * @param LDAP $result
+	 * @return mixed|string
+	 */
 	public function getDN($link, $result) {
 		return $this->invokeLDAPMethod('get_dn', $link, $result);
 	}
 
+	/**
+	 * @param LDAP $link
+	 * @param LDAP $result
+	 * @return array|mixed
+	 */
 	public function getEntries($link, $result) {
 		return $this->invokeLDAPMethod('get_entries', $link, $result);
 	}
 
+	/**
+	 * @param LDAP $link
+	 * @param resource $result
+	 * @return mixed|an
+	 */
 	public function nextEntry($link, $result) {
 		return $this->invokeLDAPMethod('next_entry', $link, $result);
 	}
 
+	/**
+	 * @param LDAP $link
+	 * @param string $baseDN
+	 * @param string $filter
+	 * @param array $attr
+	 * @return mixed
+	 */
 	public function read($link, $baseDN, $filter, $attr) {
 		return $this->invokeLDAPMethod('read', $link, $baseDN, $filter, $attr);
 	}
 
-	public function search($link, $baseDN, $filter, $attr, $attrsonly = 0, $limit = 0) {
-		return $this->invokeLDAPMethod('search', $link, $baseDN, $filter,
-										$attr, $attrsonly, $limit);
+	/**
+	 * @param LDAP $link
+	 * @param string $baseDN
+	 * @param string $filter
+	 * @param array $attr
+	 * @param int $attrsOnly
+	 * @param int $limit
+	 * @return mixed
+	 */
+	public function search($link, $baseDN, $filter, $attr, $attrsOnly = 0, $limit = 0) {
+		return $this->invokeLDAPMethod('search', $link, $baseDN, $filter, $attr, $attrsOnly, $limit);
 	}
 
+	/**
+	 * @param LDAP $link
+	 * @param string $option
+	 * @param int $value
+	 * @return bool|mixed
+	 */
 	public function setOption($link, $option, $value) {
 		return $this->invokeLDAPMethod('set_option', $link, $option, $value);
 	}
 
-	public function sort($link, $result, $sortfilter) {
-		return $this->invokeLDAPMethod('sort', $link, $result, $sortfilter);
+	/**
+	 * @param LDAP $link
+	 * @param LDAP $result
+	 * @param string $sortFilter
+	 * @return mixed
+	 */
+	public function sort($link, $result, $sortFilter) {
+		return $this->invokeLDAPMethod('sort', $link, $result, $sortFilter);
 	}
 
+	/**
+	 * @param LDAP $link
+	 * @return mixed|true
+	 */
 	public function startTls($link) {
 		return $this->invokeLDAPMethod('start_tls', $link);
 	}
 
+	/**
+	 * @param resource $link
+	 * @return bool|mixed
+	 */
 	public function unbind($link) {
 		return $this->invokeLDAPMethod('unbind', $link);
 	}
 
 	/**
-	 * @brief Checks whether the server supports LDAP
+	 * Checks whether the server supports LDAP
 	 * @return boolean if it the case, false otherwise
 	 * */
 	public function areLDAPFunctionsAvailable() {
@@ -115,7 +212,7 @@ class LDAP implements ILDAPWrapper {
 	}
 
 	/**
-	 * @brief Checks whether PHP supports LDAP Paged Results
+	 * Checks whether PHP supports LDAP Paged Results
 	 * @return boolean if it the case, false otherwise
 	 * */
 	public function hasPagedResultSupport() {
@@ -125,14 +222,17 @@ class LDAP implements ILDAPWrapper {
 	}
 
 	/**
-	 * @brief Checks whether the submitted parameter is a resource
-	 * @param $resource the resource variable to check
-	 * @return boolean if it is a resource, false otherwise
+	 * Checks whether the submitted parameter is a resource
+	 * @param Resource $resource the resource variable to check
+	 * @return bool true if it is a resource, false otherwise
 	 */
 	public function isResource($resource) {
 		return is_resource($resource);
 	}
 
+	/**
+	 * @return mixed
+	 */
 	private function invokeLDAPMethod() {
 		$arguments = func_get_args();
 		$func = 'ldap_' . array_shift($arguments);
@@ -148,6 +248,7 @@ class LDAP implements ILDAPWrapper {
 
 	/**
 	 * @param string $functionName
+	 * @param array $args
 	 */
 	private function preFunctionCall($functionName, $args) {
 		$this->curFunc = $functionName;
@@ -181,4 +282,4 @@ class LDAP implements ILDAPWrapper {
 		$this->curFunc = '';
 		$this->curArgs = array();
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/user_ldap/lib/ldaputility.php b/apps/user_ldap/lib/ldaputility.php
index 7fffd9c88d..aa1e75e928 100644
--- a/apps/user_ldap/lib/ldaputility.php
+++ b/apps/user_ldap/lib/ldaputility.php
@@ -27,8 +27,8 @@ abstract class LDAPUtility {
 	protected $ldap;
 
 	/**
-	 * @brief constructor, make sure the subclasses call this one!
-	 * @param $ldapWrapper an instance of an ILDAPWrapper
+	 * constructor, make sure the subclasses call this one!
+	 * @param ILDAPWrapper $ldapWrapper an instance of an ILDAPWrapper
 	 */
 	public function __construct(ILDAPWrapper $ldapWrapper) {
 		$this->ldap = $ldapWrapper;
diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php
index 0eb294eb7a..d15d1ae861 100644
--- a/apps/user_ldap/lib/proxy.php
+++ b/apps/user_ldap/lib/proxy.php
@@ -29,16 +29,26 @@ abstract class Proxy {
 	static private $accesses = array();
 	private $ldap = null;
 
+	/**
+	 * @param ILDAPWrapper $ldap
+	 */
 	public function __construct(ILDAPWrapper $ldap) {
 		$this->ldap = $ldap;
-		$this->cache = \OC_Cache::getGlobalCache();
+		$this->cache = \OC\Cache::getGlobalCache();
 	}
 
+	/**
+	 * @param string $configPrefix
+	 */
 	private function addAccess($configPrefix) {
 		$connector = new Connection($this->ldap, $configPrefix);
 		self::$accesses[$configPrefix] = new Access($connector, $this->ldap);
 	}
 
+	/**
+	 * @param string $configPrefix
+	 * @return mixed
+	 */
 	protected function getAccess($configPrefix) {
 		if(!isset(self::$accesses[$configPrefix])) {
 			$this->addAccess($configPrefix);
@@ -46,30 +56,45 @@ abstract class Proxy {
 		return self::$accesses[$configPrefix];
 	}
 
+	/**
+	 * @param string $uid
+	 * @return string
+	 */
 	protected function getUserCacheKey($uid) {
 		return 'user-'.$uid.'-lastSeenOn';
 	}
 
+	/**
+	 * @param string $gid
+	 * @return string
+	 */
 	protected function getGroupCacheKey($gid) {
 		return 'group-'.$gid.'-lastSeenOn';
 	}
 
 	/**
-	 * @param boolean $passOnWhen
+	 * @param string $id
 	 * @param string $method
+	 * @param array $parameters
+	 * @param bool $passOnWhen
+	 * @return mixed
 	 */
 	abstract protected function callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
 
 	/**
+	 * @param string $id
 	 * @param string $method
+	 * @param array $parameters
+	 * @return mixed
 	 */
 	abstract protected function walkBackends($id, $method, $parameters);
 
 	/**
-	 * @brief Takes care of the request to the User backend
-	 * @param $uid string, the uid connected to the request
+	 * Takes care of the request to the User backend
+	 * @param string $id
 	 * @param string $method string, the method of the user backend that shall be called
-	 * @param $parameters an array of parameters to be passed
+	 * @param array $parameters an array of parameters to be passed
+	 * @param bool $passOnWhen
 	 * @return mixed, the result of the specified method
 	 */
 	protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
@@ -82,6 +107,7 @@ abstract class Proxy {
 
 	/**
 	 * @param string|null $key
+	 * @return string
 	 */
 	private function getCacheKey($key) {
 		$prefix = 'LDAP-Proxy-';
@@ -93,6 +119,7 @@ abstract class Proxy {
 
 	/**
 	 * @param string $key
+	 * @return mixed|null
 	 */
 	public function getFromCache($key) {
 		if(!$this->isCached($key)) {
@@ -105,6 +132,7 @@ abstract class Proxy {
 
 	/**
 	 * @param string $key
+	 * @return bool
 	 */
 	public function isCached($key) {
 		$key = $this->getCacheKey($key);
@@ -113,6 +141,7 @@ abstract class Proxy {
 
 	/**
 	 * @param string $key
+	 * @param mixed $value
 	 */
 	public function writeToCache($key, $value) {
 		$key   = $this->getCacheKey($key);
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 8406b2d42a..b8a0e5ad79 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -44,9 +44,9 @@ class Wizard extends LDAPUtility {
 	const LDAP_NW_TIMEOUT = 4;
 
 	/**
-	 * @brief Constructor
-	 * @param $configuration an instance of Configuration
-	 * @param $ldap	an instance of ILDAPWrapper
+	 * Constructor
+	 * @param Configuration $configuration an instance of Configuration
+	 * @param ILDAPWrapper $ldap an instance of ILDAPWrapper
 	 */
 	public function __construct(Configuration $configuration, ILDAPWrapper $ldap) {
 		parent::__construct($ldap);
@@ -63,6 +63,10 @@ class Wizard extends LDAPUtility {
 		}
 	}
 
+	/**
+	 * @return WizardResult
+	 * @throws \Exception
+	 */
 	public function countGroups() {
 		if(!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
@@ -96,6 +100,10 @@ class Wizard extends LDAPUtility {
 		return $this->result;
 	}
 
+	/**
+	 * @return WizardResult
+	 * @throws \Exception
+	 */
 	public function countUsers() {
 		if(!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
@@ -125,7 +133,10 @@ class Wizard extends LDAPUtility {
 		return $this->result;
 	}
 
-
+	/**
+	 * @return WizardResult
+	 * @throws \Exception
+	 */
 	public function determineAttributes() {
 		if(!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
@@ -151,7 +162,8 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief return the state of the Group Filter Mode
+	 * return the state of the Group Filter Mode
+	 * @return WizardResult
 	 */
 	public function getGroupFilterMode() {
 		$this->getFilterMode('ldapGroupFilterMode');
@@ -159,7 +171,8 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief return the state of the Login Filter Mode
+	 * return the state of the Login Filter Mode
+	 * @return WizardResult
 	 */
 	public function getLoginFilterMode() {
 		$this->getFilterMode('ldapLoginFilterMode');
@@ -167,7 +180,8 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief return the state of the User Filter Mode
+	 * return the state of the User Filter Mode
+	 * @return WizardResult
 	 */
 	public function getUserFilterMode() {
 		$this->getFilterMode('ldapUserFilterMode');
@@ -175,20 +189,21 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief return the state of the mode of the specified filter
-	 * @param string $confkey string, contains the access key of the Configuration
+	 * return the state of the mode of the specified filter
+	 * @param string $confKey contains the access key of the Configuration
 	 */
-	private function getFilterMode($confkey) {
-		$mode = $this->configuration->$confkey;
+	private function getFilterMode($confKey) {
+		$mode = $this->configuration->$confKey;
 		if(is_null($mode)) {
 			$mode = $this->LFILTER_MODE_ASSISTED;
 		}
-		$this->result->addChange($confkey, $mode);
+		$this->result->addChange($confKey, $mode);
 	}
 
 	/**
-	 * @brief detects the available LDAP attributes
-	 * @returns the instance's WizardResult instance
+	 * detects the available LDAP attributes
+	 * @return array The instance's WizardResult instance
+	 * @throws \Exception
 	 */
 	private function getUserAttributes() {
 		if(!$this->checkRequirements(array('ldapHost',
@@ -220,8 +235,8 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief detects the available LDAP groups
-	 * @returns the instance's WizardResult instance
+	 * detects the available LDAP groups
+	 * @return WizardResult the instance's WizardResult instance
 	 */
 	public function determineGroupsForGroups() {
 		return $this->determineGroups('ldap_groupfilter_groups',
@@ -230,8 +245,8 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief detects the available LDAP groups
-	 * @returns the instance's WizardResult instance
+	 * detects the available LDAP groups
+	 * @return WizardResult the instance's WizardResult instance
 	 */
 	public function determineGroupsForUsers() {
 		return $this->determineGroups('ldap_userfilter_groups',
@@ -239,12 +254,14 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief detects the available LDAP groups
-	 * @param string $dbkey
-	 * @param string $confkey
-	 * @returns the instance's WizardResult instance
+	 * detects the available LDAP groups
+	 * @param string $dbKey
+	 * @param string $confKey
+	 * @param bool $testMemberOf
+	 * @return WizardResult the instance's WizardResult instance
+	 * @throws \Exception
 	 */
-	private function determineGroups($dbkey, $confkey, $testMemberOf = true) {
+	private function determineGroups($dbKey, $confKey, $testMemberOf = true) {
 		if(!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
 										   'ldapBase',
@@ -256,8 +273,8 @@ class Wizard extends LDAPUtility {
 			throw new \Exception('Could not connect to LDAP');
 		}
 
-		$obclasses = array('posixGroup', 'group', 'zimbraDistributionList', '*');
-		$this->determineFeature($obclasses, 'cn', $dbkey, $confkey);
+		$obClasses = array('posixGroup', 'group', 'zimbraDistributionList', '*');
+		$this->determineFeature($obClasses, 'cn', $dbKey, $confKey);
 
 		if($testMemberOf) {
 			$this->configuration->hasMemberOfFilterSupport = $this->testMemberOf();
@@ -270,6 +287,10 @@ class Wizard extends LDAPUtility {
 		return $this->result;
 	}
 
+	/**
+	 * @return bool|WizardResult
+	 * @throws \Exception
+	 */
 	public function determineGroupMemberAssoc() {
 		if(!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
@@ -289,8 +310,9 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief detects the available object classes
-	 * @returns the instance's WizardResult instance
+	 * Detects the available object classes
+	 * @return WizardResult the instance's WizardResult instance
+	 * @throws \Exception
 	 */
 	public function determineGroupObjectClasses() {
 		if(!$this->checkRequirements(array('ldapHost',
@@ -315,8 +337,9 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief detects the available object classes
-	 * @returns the instance's WizardResult instance
+	 * detects the available object classes
+	 * @return WizardResult
+	 * @throws \Exception
 	 */
 	public function determineUserObjectClasses() {
 		if(!$this->checkRequirements(array('ldapHost',
@@ -344,6 +367,10 @@ class Wizard extends LDAPUtility {
 		return $this->result;
 	}
 
+	/**
+	 * @return WizardResult
+	 * @throws \Exception
+	 */
 	public function getGroupFilter() {
 		if(!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
@@ -364,6 +391,10 @@ class Wizard extends LDAPUtility {
 		return $this->result;
 	}
 
+	/**
+	 * @return WizardResult
+	 * @throws \Exception
+	 */
 	public function getUserListFilter() {
 		if(!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
@@ -386,6 +417,10 @@ class Wizard extends LDAPUtility {
 		return $this->result;
 	}
 
+	/**
+	 * @return bool|WizardResult
+	 * @throws \Exception
+	 */
 	public function getUserLoginFilter() {
 		if(!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
@@ -406,7 +441,8 @@ class Wizard extends LDAPUtility {
 
 	/**
 	 * Tries to determine the port, requires given Host, User DN and Password
-	 * @returns mixed WizardResult on success, false otherwise
+	 * @return WizardResult|false WizardResult on success, false otherwise
+	 * @throws \Exception
 	 */
 	public function guessPortAndTLS() {
 		if(!$this->checkRequirements(array('ldapHost',
@@ -443,8 +479,8 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief tries to determine a base dn from User DN or LDAP Host
-	 * @returns mixed WizardResult on success, false otherwise
+	 * tries to determine a base dn from User DN or LDAP Host
+	 * @return WizardResult|false WizardResult on success, false otherwise
 	 */
 	public function guessBaseDN() {
 		if(!$this->checkRequirements(array('ldapHost',
@@ -483,11 +519,10 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief sets the found value for the configuration key in the WizardResult
+	 * sets the found value for the configuration key in the WizardResult
 	 * as well as in the Configuration instance
 	 * @param string $key the configuration key
-	 * @param $value the (detected) value
-	 * @return null
+	 * @param string $value the (detected) value
 	 *
 	 */
 	private function applyFind($key, $value) {
@@ -496,7 +531,7 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief Checks, whether a port was entered in the Host configuration
+	 * Checks, whether a port was entered in the Host configuration
 	 * field. In this case the port will be stripped off, but also stored as
 	 * setting.
 	 */
@@ -514,9 +549,10 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief tries to detect the group member association attribute which is
+	 * tries to detect the group member association attribute which is
 	 * one of 'uniqueMember', 'memberUid', 'member'
-	 * @return mixed, string with the attribute name, false on error
+	 * @return string|false, string with the attribute name, false on error
+	 * @throws \Exception
 	 */
 	private function detectGroupMemberAssoc() {
 		$possibleAttrs = array('uniqueMember', 'memberUid', 'member', 'unfugasdfasdfdfa');
@@ -535,7 +571,7 @@ class Wizard extends LDAPUtility {
 		}
 		$er = $this->ldap->firstEntry($cr, $rr);
 		while(is_resource($er)) {
-			$dn = $this->ldap->getDN($cr, $er);
+			$this->ldap->getDN($cr, $er);
 			$attrs = $this->ldap->getAttributes($cr, $er);
 			$result = array();
 			for($i = 0; $i < count($possibleAttrs); $i++) {
@@ -555,9 +591,10 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief Checks whether for a given BaseDN results will be returned
+	 * Checks whether for a given BaseDN results will be returned
 	 * @param string $base the BaseDN to test
 	 * @return bool true on success, false otherwise
+	 * @throws \Exception
 	 */
 	private function testBaseDN($base) {
 		$cr = $this->getConnection();
@@ -580,10 +617,11 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief Checks whether the server supports memberOf in LDAP Filter.
+	 * Checks whether the server supports memberOf in LDAP Filter.
 	 * Requires that groups are determined, thus internally called from within
 	 * determineGroups()
-	 * @return bool, true if it does, false otherwise
+	 * @return bool true if it does, false otherwise
+	 * @throws \Exception
 	 */
 	private function testMemberOf() {
 		$cr = $this->getConnection();
@@ -603,7 +641,7 @@ class Wizard extends LDAPUtility {
 				//assuming only groups have their cn cached :)
 				continue;
 			}
-		    $filter = strtolower($filterPrefix . $dn . $filterSuffix);
+			$filter = strtolower($filterPrefix . $dn . $filterSuffix);
 			$rr = $this->ldap->search($cr, $base, $filter, array('dn'));
 			if(!$this->ldap->isResource($rr)) {
 				continue;
@@ -620,11 +658,12 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief creates an LDAP Filter from given configuration
+	 * creates an LDAP Filter from given configuration
 	 * @param integer $filterType int, for which use case the filter shall be created
 	 * can be any of self::LFILTER_USER_LIST, self::LFILTER_LOGIN or
 	 * self::LFILTER_GROUP_LIST
-	 * @return mixed, string with the filter on success, false otherwise
+	 * @return string|false string with the filter on success, false otherwise
+	 * @throws \Exception
 	 */
 	private function composeLdapFilter($filterType) {
 		$filter = '';
@@ -737,7 +776,7 @@ class Wizard extends LDAPUtility {
 				if(is_array($attrsToFilter) && count($attrsToFilter) > 0) {
 					$filterAttributes = '(|';
 					foreach($attrsToFilter as $attribute) {
-					    $filterAttributes .= '(' . $attribute . $loginpart . ')';
+						$filterAttributes .= '(' . $attribute . $loginpart . ')';
 					}
 					$filterAttributes .= ')';
 					$parts++;
@@ -765,9 +804,11 @@ class Wizard extends LDAPUtility {
 
 	/**
 	 * Connects and Binds to an LDAP Server
-	 * @param $port the port to connect with
-	 * @param $tls whether startTLS is to be used
-	 * @return
+	 * @param int $port the port to connect with
+	 * @param bool $tls whether startTLS is to be used
+	 * @param bool $ncc
+	 * @return bool
+	 * @throws \Exception
 	 */
 	private function connectAndBind($port = 389, $tls = false, $ncc = false) {
 		if($ncc) {
@@ -819,27 +860,26 @@ class Wizard extends LDAPUtility {
 			if($ncc) {
 				throw new \Exception('Certificate cannot be validated.');
 			}
-			\OCP\Util::writeLog('user_ldap', 'Wiz: Bind successfull to Port '. $port . ' TLS ' . intval($tls), \OCP\Util::DEBUG);
+			\OCP\Util::writeLog('user_ldap', 'Wiz: Bind successful to Port '. $port . ' TLS ' . intval($tls), \OCP\Util::DEBUG);
 			return true;
 		}
 
-		$errno = $this->ldap->errno($cr);
+		$errNo = $this->ldap->errno($cr);
 		$error = ldap_error($cr);
 		$this->ldap->unbind($cr);
-		if($errno === -1 || ($errno === 2 && $ncc)) {
+		if($errNo === -1 || ($errNo === 2 && $ncc)) {
 			//host, port or TLS wrong
 			return false;
-		} else if ($errno === 2) {
+		} else if ($errNo === 2) {
 			return $this->connectAndBind($port, $tls, true);
 		}
 		throw new \Exception($error);
 	}
 
 	/**
-	 * @brief checks whether a valid combination of agent and password has been
+	 * checks whether a valid combination of agent and password has been
 	 * provided (either two values or nothing for anonymous connect)
-	 * @return boolean, true if everything is fine, false otherwise
-	 *
+	 * @return bool, true if everything is fine, false otherwise
 	 */
 	private function checkAgentRequirements() {
 		$agent = $this->configuration->ldapAgentName;
@@ -850,7 +890,8 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @param string[] $reqs
+	 * @param array $reqs
+	 * @return bool
 	 */
 	private function checkRequirements($reqs) {
 		$this->checkAgentRequirements();
@@ -864,18 +905,17 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief does a cumulativeSearch on LDAP to get different values of a
+	 * does a cumulativeSearch on LDAP to get different values of a
 	 * specified attribute
 	 * @param string[] $filters array, the filters that shall be used in the search
 	 * @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
+	 * @param bool $lfw 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
-	 *
+	 * @return array|false an array with the values on success, false otherwise
 	 */
 	public function cumulativeSearchOnAttribute($filters, $attr, $lfw = true, $dnReadLimit = 3, &$maxF = null) {
 		$dnRead = array();
@@ -941,15 +981,16 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief determines if and which $attr are available on the LDAP server
+	 * determines if and which $attr are available on the LDAP server
 	 * @param string[] $objectclasses the objectclasses to use as search filter
 	 * @param string $attr the attribute to look for
 	 * @param string $dbkey the dbkey of the setting the feature is connected to
 	 * @param string $confkey the confkey counterpart for the $dbkey as used in the
 	 * Configuration class
-	 * @param $po boolean, whether the objectClass with most result entries
+	 * @param bool $po whether the objectClass with most result entries
 	 * shall be pre-selected via the result
-	 * @returns array, list of found items.
+	 * @return array, list of found items.
+	 * @throws \Exception
 	 */
 	private function determineFeature($objectclasses, $attr, $dbkey, $confkey, $po = false) {
 		$cr = $this->getConnection();
@@ -999,10 +1040,10 @@ class Wizard extends LDAPUtility {
 	}
 
 	/**
-	 * @brief appends a list of values fr
-	 * @param $result resource, the return value from ldap_get_attributes
+	 * appends a list of values fr
+	 * @param resource $result the return value from ldap_get_attributes
 	 * @param string $attribute the attribute values to look for
-	 * @param &$known array, new values will be appended here
+	 * @param array &$known new values will be appended here
 	 * @return int, state on of the class constants LRESULT_PROCESSED_OK,
 	 * LRESULT_PROCESSED_INVALID or LRESULT_PROCESSED_SKIP
 	 */
@@ -1013,7 +1054,7 @@ class Wizard extends LDAPUtility {
 			return self::LRESULT_PROCESSED_INVALID;
 		}
 
-		//strtolower on all keys for proper comparison
+		// strtolower on all keys for proper comparison
 		$result = \OCP\Util::mb_array_change_key_case($result);
 		$attribute = strtolower($attribute);
 		if(isset($result[$attribute])) {
@@ -1031,6 +1072,9 @@ class Wizard extends LDAPUtility {
 		}
 	}
 
+	/**
+	 * @return bool|mixed
+	 */
 	private function getConnection() {
 		if(!is_null($this->cr)) {
 			return $this->cr;
@@ -1057,6 +1101,9 @@ class Wizard extends LDAPUtility {
 		return false;
 	}
 
+	/**
+	 * @return array
+	 */
 	private function getDefaultLdapPortSettings() {
 		static $settings = array(
 								array('port' => 7636, 'tls' => false),
@@ -1069,6 +1116,9 @@ class Wizard extends LDAPUtility {
 		return $settings;
 	}
 
+	/**
+	 * @return array
+	 */
 	private function getPortSettingsToTry() {
 		//389 ← LDAP / Unencrypted or StartTLS
 		//636 ← LDAPS / SSL
@@ -1096,4 +1146,4 @@ class Wizard extends LDAPUtility {
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/apps/user_ldap/lib/wizardresult.php b/apps/user_ldap/lib/wizardresult.php
index 9e0936faa6..42b0bc0465 100644
--- a/apps/user_ldap/lib/wizardresult.php
+++ b/apps/user_ldap/lib/wizardresult.php
@@ -28,10 +28,17 @@ class WizardResult {
 	protected $options = array();
 	protected $markedChange = false;
 
+	/**
+	 * @param string $key
+	 * @param mixed $value
+	 */
 	public function addChange($key, $value) {
 		$this->changes[$key] = $value;
 	}
 
+	/**
+	 *
+	 */
 	public function markChange() {
 		$this->markedChange = true;
 	}
@@ -47,10 +54,16 @@ class WizardResult {
 		$this->options[$key] = $values;
 	}
 
+	/**
+	 * @return bool
+	 */
 	public function hasChanges() {
 		return (count($this->changes) > 0 || $this->markedChange);
 	}
 
+	/**
+	 * @return array
+	 */
 	public function getResultArray() {
 		$result = array();
 		$result['changes'] = $this->changes;
@@ -59,4 +72,4 @@ class WizardResult {
 		}
 		return $result;
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 6b7d8e6f53..7acc997e28 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -71,7 +71,7 @@ $tmpl->assign('settingControls', $sControls);
 $config = new \OCA\user_ldap\lib\Configuration('', false);
 $defaults = $config->getDefaults();
 foreach($defaults as $key => $default) {
-    $tmpl->assign($key.'_default', $default);
+	$tmpl->assign($key.'_default', $default);
 }
 
 return $tmpl->fetchPage();
diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php
index 8c8d85b3c3..2535c34bcf 100644
--- a/apps/user_ldap/tests/user_ldap.php
+++ b/apps/user_ldap/tests/user_ldap.php
@@ -71,15 +71,15 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase {
 						case 'ladyofshadows':
 							return 'dnOfLadyOfShadows';
 							break;
-						defautl:
+						default:
 							return false;
 					}
 			   }));
 	}
 
 	/**
-	 * @brief Prepares the Access mock for checkPassword tests
-	 * @param $access mock of \OCA\user_ldap\lib\Access
+	 * Prepares the Access mock for checkPassword tests
+	 * @param \OCA\user_ldap\lib\Access $access mock
 	 * @return void
 	 */
 	private function prepareAccessForCheckPassword(&$access) {
@@ -186,8 +186,8 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @brief Prepares the Access mock for getUsers tests
-	 * @param $access mock of \OCA\user_ldap\lib\Access
+	 * Prepares the Access mock for getUsers tests
+	 * @param \OCA\user_ldap\lib\Access $access mock
 	 * @return void
 	 */
 	private function prepareAccessForGetUsers(&$access) {
@@ -557,4 +557,4 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase {
 		$result = $backend->countUsers();
 		$this->assertFalse($result);
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 757de6b60f..aece2ee9aa 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -69,9 +69,9 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief reads jpegPhoto and set is as avatar if available
-	 * @param $uid string ownCloud user name
-	 * @param $dn string the user's LDAP DN
+	 * reads jpegPhoto and set is as avatar if available
+	 * @param string $uid ownCloud user name
+	 * @param string $dn the user's LDAP DN
 	 * @return void
 	 */
 	private function updateAvatar($uid, $dn) {
@@ -117,8 +117,8 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief checks whether the user is allowed to change his avatar in ownCloud
-	 * @param $uid string the ownCloud user name
+	 * checks whether the user is allowed to change his avatar in ownCloud
+	 * @param string $uid the ownCloud user name
 	 * @return boolean either the user can or cannot
 	 */
 	public function canChangeAvatar($uid) {
@@ -135,9 +135,9 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief reads the image from LDAP that shall be used as Avatar
-	 * @param $uid string, the ownCloud user name
-	 * @param $dn string, the user DN
+	 * reads the image from LDAP that shall be used as Avatar
+	 * @param string $uid the ownCloud user name
+	 * @param string $dn the user DN
 	 * @return string data (provided by LDAP) | false
 	 */
 	private function getAvatarImage($uid, $dn) {
@@ -155,7 +155,7 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief Check if the password is correct
+	 * Check if the password is correct
 	 * @param string $uid The username
 	 * @param string $password The password
 	 * @return boolean
@@ -199,8 +199,8 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief Get a list of all users
-	 * @returns array with all uids
+	 * Get a list of all users
+	 * @return string[] with all uids
 	 *
 	 * Get a list of all users.
 	 */
@@ -240,7 +240,7 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief check if a user exists
+	 * check if a user exists
 	 * @param string $uid the username
 	 * @return boolean
 	 */
@@ -271,9 +271,9 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
 	}
 
 	/**
-	* @brief delete a user
-	* @param $uid The username of the user to delete
-	* @returns true/false
+	* delete a user
+	* @param string $uid The username of the user to delete
+	* @return bool
 	*
 	* Deletes a user
 	*/
@@ -282,7 +282,7 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
 	}
 
 	/**
-	* @brief get the user's home directory
+	* get the user's home directory
 	* @param string $uid the username
 	* @return boolean
 	*/
@@ -325,9 +325,9 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief get display name of the user
-	 * @param $uid user ID of the user
-	 * @return display name
+	 * get display name of the user
+	 * @param string $uid user ID of the user
+	 * @return string display name
 	 */
 	public function getDisplayName($uid) {
 		if(!$this->userExists($uid)) {
@@ -352,8 +352,8 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief Get a list of all display names
-	 * @returns array with  all displayNames (value) and the correspondig uids (key)
+	 * Get a list of all display names
+	 * @return array with all displayNames (value) and the correspondig uids (key)
 	 *
 	 * Get a list of all display names and user ids.
 	 */
@@ -372,10 +372,10 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
 		return $displayNames;
 	}
 
-		/**
-	* @brief Check if backend implements actions
-	* @param $actions bitwise-or'ed actions
-	* @returns boolean
+	/**
+	* Check if backend implements actions
+	* @param int $actions bitwise-or'ed actions
+	* @return boolean
 	*
 	* Returns the supported actions as int to be
 	* compared with OC_USER_BACKEND_CREATE_USER etc.
@@ -399,7 +399,7 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
 	/**
 	 * counts the users in LDAP
 	 *
-	 * @return int | bool
+	 * @return int|bool
 	 */
 	public function countUsers() {
 		$filter = \OCP\Util::mb_str_replace(
diff --git a/apps/user_ldap/user_proxy.php b/apps/user_ldap/user_proxy.php
index 2cb3dfb2c6..fa4d693930 100644
--- a/apps/user_ldap/user_proxy.php
+++ b/apps/user_ldap/user_proxy.php
@@ -30,13 +30,13 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 	private $refBackend = null;
 
 	/**
-	 * @brief Constructor
-	 * @param $serverConfigPrefixes array containing the config Prefixes
+	 * Constructor
+	 * @param array $serverConfigPrefixes array containing the config Prefixes
 	 */
 	public function __construct($serverConfigPrefixes, ILDAPWrapper $ldap) {
 		parent::__construct($ldap);
 		foreach($serverConfigPrefixes as $configPrefix) {
-		    $this->backends[$configPrefix] =
+			$this->backends[$configPrefix] =
 				new \OCA\user_ldap\USER_LDAP($this->getAccess($configPrefix));
 			if(is_null($this->refBackend)) {
 				$this->refBackend = &$this->backends[$configPrefix];
@@ -45,13 +45,13 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief Tries the backends one after the other until a positive result is returned from the specified method
-	 * @param $uid string, the uid connected to the request
-	 * @param $method string, the method of the user backend that shall be called
-	 * @param $parameters an array of parameters to be passed
-	 * @return mixed, the result of the method or false
+	 * Tries the backends one after the other until a positive result is returned from the specified method
+	 * @param string $uid the uid connected to the request
+	 * @param string $method the method of the user backend that shall be called
+	 * @param array $parameters an array of parameters to be passed
+	 * @return mixed the result of the method or false
 	 */
-	protected  function walkBackends($uid, $method, $parameters) {
+	protected function walkBackends($uid, $method, $parameters) {
 		$cacheKey = $this->getUserCacheKey($uid);
 		foreach($this->backends as $configPrefix => $backend) {
 			$instance = $backend;
@@ -68,14 +68,14 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief Asks the backend connected to the server that supposely takes care of the uid from the request.
-	 * @param $uid string, the uid connected to the request
-	 * @param $method string, the method of the user backend that shall be called
-	 * @param $parameters an array of parameters to be passed
-	 * @param $passOnWhen the result matches this variable
-	 * @return mixed, the result of the method or false
+	 * Asks the backend connected to the server that supposely takes care of the uid from the request.
+	 * @param string $uid the uid connected to the request
+	 * @param string $method the method of the user backend that shall be called
+	 * @param array $parameters an array of parameters to be passed
+	 * @param mixed $passOnWhen the result matches this variable
+	 * @return mixed the result of the method or false
 	 */
-	protected  function callOnLastSeenOn($uid, $method, $parameters, $passOnWhen) {
+	protected function callOnLastSeenOn($uid, $method, $parameters, $passOnWhen) {
 		$cacheKey = $this->getUserCacheKey($uid);
 		$prefix = $this->getFromCache($cacheKey);
 		//in case the uid has been found in the past, try this stored connection first
@@ -105,9 +105,9 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief Check if backend implements actions
-	 * @param $actions bitwise-or'ed actions
-	 * @returns boolean
+	 * Check if backend implements actions
+	 * @param int $actions bitwise-or'ed actions
+	 * @return boolean
 	 *
 	 * Returns the supported actions as int to be
 	 * compared with OC_USER_BACKEND_CREATE_USER etc.
@@ -118,8 +118,8 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief Get a list of all users
-	 * @returns array with all uids
+	 * Get a list of all users
+	 * @return string[] with all uids
 	 *
 	 * Get a list of all users.
 	 */
@@ -136,7 +136,7 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief check if a user exists
+	 * check if a user exists
 	 * @param string $uid the username
 	 * @return boolean
 	 */
@@ -145,10 +145,10 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief Check if the password is correct
-	 * @param $uid The username
-	 * @param $password The password
-	 * @returns true/false
+	 * Check if the password is correct
+	 * @param string $uid The username
+	 * @param string $password The password
+	 * @return bool
 	 *
 	 * Check if the password is correct without logging in the user
 	 */
@@ -157,7 +157,7 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief get the user's home directory
+	 * get the user's home directory
 	 * @param string $uid the username
 	 * @return boolean
 	 */
@@ -166,17 +166,17 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief get display name of the user
-	 * @param $uid user ID of the user
-	 * @return display name
+	 * get display name of the user
+	 * @param string $uid user ID of the user
+	 * @return string display name
 	 */
 	public function getDisplayName($uid) {
 		return $this->handleRequest($uid, 'getDisplayName', array($uid));
 	}
 
 	/**
-	 * @brief checks whether the user is allowed to change his avatar in ownCloud
-	 * @param $uid string the ownCloud user name
+	 * checks whether the user is allowed to change his avatar in ownCloud
+	 * @param string $uid the ownCloud user name
 	 * @return boolean either the user can or cannot
 	 */
 	public function canChangeAvatar($uid) {
@@ -184,8 +184,8 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief Get a list of all display names
-	 * @returns array with  all displayNames (value) and the corresponding uids (key)
+	 * Get a list of all display names
+	 * @return array with all displayNames (value) and the corresponding uids (key)
 	 *
 	 * Get a list of all display names and user ids.
 	 */
@@ -202,9 +202,9 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief delete a user
-	 * @param $uid The username of the user to delete
-	 * @returns true/false
+	 * delete a user
+	 * @param string $uid The username of the user to delete
+	 * @return bool
 	 *
 	 * Deletes a user
 	 */
@@ -220,8 +220,8 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 	}
 
 	/**
-	 * @brief Count the number of users
-	 * @returns int | bool
+	 * Count the number of users
+	 * @return int|bool
 	 */
 	public function countUsers() {
 		$users = false;
diff --git a/apps/user_webdavauth/l10n/ro.php b/apps/user_webdavauth/l10n/ro.php
index 5780805a88..24e3c9f917 100644
--- a/apps/user_webdavauth/l10n/ro.php
+++ b/apps/user_webdavauth/l10n/ro.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"WebDAV Authentication" => "Autentificare WebDAV"
+"WebDAV Authentication" => "Autentificare WebDAV",
+"Address: " => "Adresa :"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/build/build.xml b/build/build.xml
index 0f9d3605da..265beb4bcc 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -40,6 +40,26 @@
    </fileset>
 
   </apply>
+
+  <!-- this looks for @brief and @returns annotation in PHP files and fails if it found some -->
+  <apply executable="egrep" failonerror="false" resultproperty="grepReturnCode">
+    <arg value="-rsHn" />
+    <arg value="@brief|@returns" />
+
+    <fileset dir="${basedir}/build">
+      <include name="**/*.php" />
+      <exclude name="**/3rdparty/**" />
+      <exclude name="**/l10n/**" />
+    </fileset>
+  </apply>
+
+  <!-- fail if grep has found something -->
+  <fail message="Please remove @returns and @brief annotations for PHPDoc (listed above)">
+    <condition>
+      <equals arg1="0" arg2="${grepReturnCode}"/>
+    </condition>
+  </fail>
+
  </target>
 
  <!-- javascript lint -->
diff --git a/config/config.sample.php b/config/config.sample.php
index adcc175e2f..708e836702 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -54,7 +54,7 @@ $CONFIG = array(
 "proxyuserpwd" => "",
 
 /* List of trusted domains, to prevent host header poisoning ownCloud is only using these Host headers */
-'trusted_domains' => array('demo.owncloud.org'),
+'trusted_domains' => array('demo.owncloud.org', 'otherdomain.owncloud.org:8080'),
 
 /* Theme to use for ownCloud */
 "theme" => "",
@@ -142,7 +142,7 @@ $CONFIG = array(
 'allow_user_to_change_display_name' => true,
 
 /* Check 3rdparty apps for malicious code fragments */
-"appcodechecker" => "",
+"appcodechecker" => true,
 
 /* Check if ownCloud is up to date */
 "updatechecker" => true,
@@ -181,9 +181,6 @@ $CONFIG = array(
 /* Whether ownCloud should log the last successfull cron exec */
 "cron_log" => true,
 
-/* Whether http-basic username must equal username to login */
-"basic_auth" => true,
-
 /*
  * Configure the size in bytes log rotation should happen, 0 or false disables the rotation.
  * This rotates the current owncloud logfile to a new name, this way the total log usage
diff --git a/core/ajax/preview.php b/core/ajax/preview.php
index 526719e8a1..d38043707a 100644
--- a/core/ajax/preview.php
+++ b/core/ajax/preview.php
@@ -11,6 +11,7 @@ $file = array_key_exists('file', $_GET) ? (string)$_GET['file'] : '';
 $maxX = array_key_exists('x', $_GET) ? (int)$_GET['x'] : '36';
 $maxY = array_key_exists('y', $_GET) ? (int)$_GET['y'] : '36';
 $scalingUp = array_key_exists('scalingup', $_GET) ? (bool)$_GET['scalingup'] : true;
+$keepAspect = array_key_exists('a', $_GET) ? true : false;
 $always = array_key_exists('forceIcon', $_GET) ? (bool)$_GET['forceIcon'] : true;
 
 if ($file === '') {
@@ -20,6 +21,10 @@ if ($file === '') {
 	exit;
 }
 
+if ($keepAspect === true) {
+	$maxY = $maxX;
+}
+
 if ($maxX === 0 || $maxY === 0) {
 	//400 Bad Request
 	\OC_Response::setStatus(400);
@@ -36,9 +41,10 @@ try {
 		$preview->setMaxX($maxX);
 		$preview->setMaxY($maxY);
 		$preview->setScalingUp($scalingUp);
+		$preview->setKeepAspect($keepAspect);
 	}
 
-	$preview->show();
+	$preview->showPreview();
 } catch (\Exception $e) {
 	\OC_Response::setStatus(500);
 	\OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG);
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 2b41bd8a5d..75b749a5b0 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -41,7 +41,8 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 						$shareType,
 						$shareWith,
 						$_POST['permissions'],
-						$_POST['itemSourceName']
+						$_POST['itemSourceName'],
+						(!empty($_POST['expirationDate']) ? new \DateTime($_POST['expirationDate']) : null)
 					);
 
 					if (is_string($token)) {
diff --git a/core/avatar/controller.php b/core/avatar/controller.php
index 2269382446..06efbec3f3 100644
--- a/core/avatar/controller.php
+++ b/core/avatar/controller.php
@@ -71,7 +71,7 @@ class Controller {
 			$image = new \OC_Image($newAvatar);
 
 			if ($image->valid()) {
-				\OC_Cache::set('tmpavatar', $image->data(), 7200);
+				\OC\Cache::set('tmpavatar', $image->data(), 7200);
 				\OC_JSON::error(array("data" => "notsquare"));
 			} else {
 				$l = new \OC_L10n('core');
@@ -109,7 +109,7 @@ class Controller {
 		\OC_JSON::checkLoggedIn();
 		\OC_JSON::callCheck();
 
-		$tmpavatar = \OC_Cache::get('tmpavatar');
+		$tmpavatar = \OC\Cache::get('tmpavatar');
 		if (is_null($tmpavatar)) {
 			$l = new \OC_L10n('core');
 			\OC_JSON::error(array("data" => array("message" => $l->t("No temporary profile picture available, try again")) ));
@@ -136,7 +136,7 @@ class Controller {
 			return;
 		}
 
-		$tmpavatar = \OC_Cache::get('tmpavatar');
+		$tmpavatar = \OC\Cache::get('tmpavatar');
 		if (is_null($tmpavatar)) {
 			$l = new \OC_L10n('core');
 			\OC_JSON::error(array("data" => array("message" => $l->t("No temporary profile picture available, try again")) ));
@@ -149,7 +149,7 @@ class Controller {
 			$avatar = new \OC_Avatar($user);
 			$avatar->set($image->data());
 			// Clean up
-			\OC_Cache::remove('tmpavatar');
+			\OC\Cache::remove('tmpavatar');
 			\OC_JSON::success();
 		} catch (\Exception $e) {
 			\OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php
new file mode 100644
index 0000000000..39e87853d6
--- /dev/null
+++ b/core/command/db/converttype.php
@@ -0,0 +1,295 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * Copyright (c) 2014 Andreas Fischer <bantu@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ *
+ */
+
+namespace OC\Core\Command\Db;
+
+use OC\Config;
+use OC\DB\Connection;
+use OC\DB\ConnectionFactory;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ConvertType extends Command {
+	/**
+	 * @var \OC\Config
+	 */
+	protected $config;
+
+	/**
+	 * @var \OC\DB\ConnectionFactory
+	 */
+	protected $connectionFactory;
+
+	/**
+	 * @param \OC\Config $config
+	 * @param \OC\DB\ConnectionFactory $connectionFactory
+	 */
+	public function __construct(Config $config, ConnectionFactory $connectionFactory) {
+		$this->config = $config;
+		$this->connectionFactory = $connectionFactory;
+		parent::__construct();
+	}
+
+	protected function configure() {
+		$this
+			->setName('db:convert-type')
+			->setDescription('Convert the ownCloud database to the newly configured one')
+			->addArgument(
+				'type',
+				InputArgument::REQUIRED,
+				'the type of the database to convert to'
+			)
+			->addArgument(
+				'username',
+				InputArgument::REQUIRED,
+				'the username of the database to convert to'
+			)
+			->addArgument(
+				'hostname',
+				InputArgument::REQUIRED,
+				'the hostname of the database to convert to'
+			)
+			->addArgument(
+				'database',
+				InputArgument::REQUIRED,
+				'the name of the database to convert to'
+			)
+			->addOption(
+				'port',
+				null,
+				InputOption::VALUE_REQUIRED,
+				'the port of the database to convert to'
+			)
+			->addOption(
+				'password',
+				null,
+				InputOption::VALUE_REQUIRED,
+				'the password of the database to convert to. Will be asked when not specified. Can also be passed via stdin.'
+			)
+			->addOption(
+				'clear-schema',
+				null,
+				InputOption::VALUE_NONE,
+				'remove all tables from the destination database'
+			)
+			->addOption(
+				'all-apps',
+				null,
+				InputOption::VALUE_NONE,
+				'whether to create schema for all apps instead of only installed apps'
+			)
+		;
+	}
+
+	protected function validateInput(InputInterface $input, OutputInterface $output) {
+		$type = $this->connectionFactory->normalizeType($input->getArgument('type'));
+		if ($type === 'sqlite3') {
+			throw new \InvalidArgumentException(
+				'Converting to SQLite (sqlite3) is currently not supported.'
+			);
+		}
+		if ($type === 'mssql') {
+			throw new \InvalidArgumentException(
+				'Converting to Microsoft SQL Server (mssql) is currently not supported.'
+			);
+		}
+		if ($type === $this->config->getValue('dbtype', '')) {
+			throw new \InvalidArgumentException(sprintf(
+				'Can not convert from %1$s to %1$s.',
+				$type
+			));
+		}
+		if ($type === 'oci' && $input->getOption('clear-schema')) {
+			// Doctrine unconditionally tries (at least in version 2.3)
+			// to drop sequence triggers when dropping a table, even though
+			// such triggers may not exist. This results in errors like
+			// "ORA-04080: trigger 'OC_STORAGES_AI_PK' does not exist".
+			throw new \InvalidArgumentException(
+				'The --clear-schema option is not supported when converting to Oracle (oci).'
+			);
+		}
+	}
+
+	protected function readPassword(InputInterface $input, OutputInterface $output) {
+		// Explicitly specified password
+		if ($input->getOption('password')) {
+			return;
+		}
+
+		// Read from stdin. stream_set_blocking is used to prevent blocking
+		// when nothing is passed via stdin.
+		stream_set_blocking(STDIN, 0);
+		$password = file_get_contents('php://stdin');
+		stream_set_blocking(STDIN, 1);
+		if (trim($password) !== '') {
+			$input->setOption('password', $password);
+			return;
+		}
+
+		// Read password by interacting
+		if ($input->isInteractive()) {
+			/** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */
+			$dialog = $this->getHelperSet()->get('dialog');
+			$password = $dialog->askHiddenResponse(
+				$output,
+				'<question>What is the database password?</question>',
+				false
+			);
+			$input->setOption('password', $password);
+			return;
+		}
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$this->validateInput($input, $output);
+		$this->readPassword($input, $output);
+
+		$fromDB = \OC_DB::getConnection();
+		$toDB = $this->getToDBConnection($input, $output);
+
+		if ($input->getOption('clear-schema')) {
+			$this->clearSchema($toDB, $input, $output);
+		}
+
+		$this->createSchema($toDB, $input, $output);
+
+		$toTables = $this->getTables($toDB);
+		$fromTables = $this->getTables($fromDB);
+
+		// warn/fail if there are more tables in 'from' database
+		$extraFromTables = array_diff($fromTables, $toTables);
+		if (!empty($extraFromTables)) {
+			$output->writeln('<comment>The following tables will not be converted:</comment>');
+			$output->writeln($extraFromTables);
+			if (!$input->getOption('all-apps')) {
+				$output->writeln('<comment>Please note that tables belonging to available but currently not installed apps</comment>');
+				$output->writeln('<comment>can be included by specifying the --all-apps option.</comment>');
+			}
+			/** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */
+			$dialog = $this->getHelperSet()->get('dialog');
+			if (!$dialog->askConfirmation(
+				$output,
+				'<question>Continue with the conversion?</question>',
+				false
+			)) {
+				return;
+			}
+		}
+		$intersectingTables = array_intersect($toTables, $fromTables);
+		$this->convertDB($fromDB, $toDB, $intersectingTables, $input, $output);
+	}
+
+	protected function createSchema(Connection $toDB, InputInterface $input, OutputInterface $output) {
+		$output->writeln('<info>Creating schema in new database</info>');
+		$schemaManager = new \OC\DB\MDB2SchemaManager($toDB);
+		$schemaManager->createDbFromStructure(\OC::$SERVERROOT.'/db_structure.xml');
+		$apps = $input->getOption('all-apps') ? \OC_App::getAllApps() : \OC_App::getEnabledApps();
+		foreach($apps as $app) {
+			if (file_exists(\OC_App::getAppPath($app).'/appinfo/database.xml')) {
+				$schemaManager->createDbFromStructure(\OC_App::getAppPath($app).'/appinfo/database.xml');
+			}
+		}
+	}
+
+	protected function getToDBConnection(InputInterface $input, OutputInterface $output) {
+		$type = $input->getArgument('type');
+		$connectionParams = array(
+			'host' => $input->getArgument('hostname'),
+			'user' => $input->getArgument('username'),
+			'password' => $input->getOption('password'),
+			'dbname' => $input->getArgument('database'),
+			'tablePrefix' => $this->config->getValue('dbtableprefix', 'oc_'),
+		);
+		if ($input->getOption('port')) {
+			$connectionParams['port'] = $input->getOption('port');
+		}
+		return $this->connectionFactory->getConnection($type, $connectionParams);
+	}
+
+	protected function clearSchema(Connection $db, InputInterface $input, OutputInterface $output) {
+		$toTables = $this->getTables($db);
+		if (!empty($toTables)) {
+			$output->writeln('<info>Clearing schema in new database</info>');
+		}
+		foreach($toTables as $table) {
+			$db->getSchemaManager()->dropTable($table);
+		}
+	}
+
+	protected function getTables(Connection $db) {
+		return $db->getSchemaManager()->listTableNames();
+	}
+
+	protected function copyTable(Connection $fromDB, Connection $toDB, $table, InputInterface $input, OutputInterface $output) {
+		/** @var $progress \Symfony\Component\Console\Helper\ProgressHelper */
+		$progress = $this->getHelperSet()->get('progress');
+		$query = 'SELECT COUNT(*) FROM '.$table;
+		$count = $fromDB->fetchColumn($query);
+		$query = 'SELECT * FROM '.$table;
+		$statement = $fromDB->executeQuery($query);
+		$progress->start($output, $count);
+		$progress->setRedrawFrequency($count > 100 ? 5 : 1);
+		while($row = $statement->fetch()) {
+			$progress->advance();
+			if ($input->getArgument('type') === 'oci') {
+				$data = $row;
+			} else {
+				$data = array();
+				foreach ($row as $columnName => $value) {
+					$data[$toDB->quoteIdentifier($columnName)] = $value;
+				}
+			}
+			$toDB->insert($table, $data);
+		}
+		$progress->finish();
+	}
+
+	protected function convertDB(Connection $fromDB, Connection $toDB, array $tables, InputInterface $input, OutputInterface $output) {
+		$this->config->setValue('maintenance', true);
+		try {
+			// copy table rows
+			foreach($tables as $table) {
+				$output->writeln($table);
+				$this->copyTable($fromDB, $toDB, $table, $input, $output);
+			}
+			if ($input->getArgument('type') === 'pgsql') {
+				$tools = new \OC\DB\PgSqlTools;
+				$tools->resynchronizeDatabaseSequences($toDB);
+			}
+			// save new database config
+			$this->saveDBInfo($input);
+		} catch(\Exception $e) {
+			$this->config->setValue('maintenance', false);
+			throw $e;
+		}
+		$this->config->setValue('maintenance', false);
+	}
+
+	protected function saveDBInfo(InputInterface $input) {
+		$type = $input->getArgument('type');
+		$username = $input->getArgument('username');
+		$dbhost = $input->getArgument('hostname');
+		$dbname = $input->getArgument('database');
+		$password = $input->getOption('password');
+		if ($input->getOption('port')) {
+			$dbhost .= ':'.$input->getOption('port');
+		}
+
+		$this->config->setValue('dbtype', $type);
+		$this->config->setValue('dbname', $dbname);
+		$this->config->setValue('dbhost', $dbhost);
+		$this->config->setValue('dbuser', $username);
+		$this->config->setValue('dbpassword', $password);
+	}
+}
diff --git a/core/css/apps.css b/core/css/apps.css
index a8dfc5b7ed..377878467c 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -178,6 +178,9 @@
 	bottom: 0;
 	border-top: 1px solid #ccc;
 }
+#app-settings.opened #app-settings-content {
+	display: block;
+}
 #app-settings-header {
 	background-color: #eee;
 }
@@ -243,7 +246,6 @@ button.loading {
 	padding-right: 30px;
 }
 
-
 /* general styles for the content area */
 .section {
 	display: block;
@@ -264,3 +266,14 @@ button.loading {
 	vertical-align: -2px;
 	margin-right: 4px;
 }
+.appear {
+	opacity: 1;
+	transition: opacity 500ms ease 0s;
+	-moz-transition: opacity 500ms ease 0s;
+	-ms-transition: opacity 500ms ease 0s;
+	-o-transition: opacity 500ms ease 0s;
+	-webkit-transition: opacity 500ms ease 0s;
+}
+.appear.transparent {
+	opacity: 0;
+}
diff --git a/core/css/fixes.css b/core/css/fixes.css
index a33afd5cf7..1563595074 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -10,6 +10,21 @@
 	background-image: url('../img/actions/delete-hover.png');
 }
 
+.lte9 .icon-triangle-e {
+	background-image: url('../img/actions/triangle-e.png');
+}
+.lte9 .icon-triangle-n {
+	background-image: url('../img/actions/triangle-n.png');
+}
+.lte9 .icon-triangle-s {
+	background-image: url('../img/actions/triangle-s.png');
+}
+.lte9 .icon-settings,
+.lte9 .settings-button {
+	background-image: url('../img/actions/settings.png');
+}
+
+
 /* IE8 needs background to be set to same color to make transparency look good. */
 .lte9 #body-login form input[type="text"] {
 	border: 1px solid lightgrey; /* use border to add 1px line between input fields */
diff --git a/core/css/mobile.css b/core/css/mobile.css
index fd0628d7e2..0185261306 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -1,5 +1,26 @@
 @media only screen and (max-width: 768px) {
 
+#body-login #header {
+	padding-top: 10px;
+}
+
+#body-login .wrapper {
+	display: -webkit-box;
+	-webkit-box-orient: horizontal;
+	-webkit-box-pack: center;
+	-webkit-box-align: center;
+
+	display: -moz-box;
+	-moz-box-orient: horizontal;
+	-moz-box-pack: center;
+	-moz-box-align: center;
+
+	display: box;
+	box-orient: horizontal;
+	box-pack: center;
+	box-align: center;
+}
+
 /* show caret indicator next to logo to make clear it is tappable */
 #owncloud.menutoggle {
 	background-image: url('../img/actions/caret.svg');
diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index 8d949e7cdb..b3393c450d 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -50,7 +50,7 @@ ul.multiselectoptions > li input[type='checkbox']:checked+label {
 
 div.multiselect, select.multiselect {
 	display: inline-block;
-	max-width: 400px;
+	max-width: 200px;
 	min-width: 150px;
 	padding-right: 10px;
 	min-height: 20px;
diff --git a/core/css/share.css b/core/css/share.css
index 4ae3b77757..1527a3a0c0 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -11,7 +11,7 @@
 	margin-right:112px;
 	position:absolute;
 	right:0;
-	width:320px;
+	width:420px;
 	z-index:500;
 	padding:16px;
 }
diff --git a/core/css/styles.css b/core/css/styles.css
index c26c556825..d21e6bc690 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -62,22 +62,12 @@ body {
 .header-right {
 	position: absolute;
 	right: 0;
-	padding-right: 10px;
+	padding: 7px 5px;
 	color: #fff;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
-	filter: alpha(opacity=50);
-	opacity: .5;
 	height: 100%;
 	max-width: 40%;
 	white-space: nowrap;
 }
-.header-right #details {
-	display: inline-block;
-	margin-top: 6px;
-	width: 100%;
-	text-overflow: ellipsis;
-	overflow: hidden;
-}
 
 /* Profile picture in header */
 #header .avatardiv {
@@ -202,6 +192,12 @@ input[type="time"] {
 	height: 31px;
 	-moz-box-sizing: border-box; box-sizing: border-box;
 }
+
+/* correctly align images inside of buttons */
+input img, button img, .button img {
+	vertical-align: text-bottom;
+}
+
 #quota {
 	cursor: default;
 	margin: 30px;
@@ -338,21 +334,6 @@ input[type="submit"].enabled {
 	position:absolute; height:100%; width:100%; padding-left:80px; padding-top: 45px;
 	-moz-box-sizing:border-box; box-sizing:border-box;
 }
-#leftcontent, .leftcontent {
-	position:relative; overflow:auto; width:256px; height:100%;
-	background:#f8f8f8; border-right:1px solid #ddd;
-	-moz-box-sizing:border-box; box-sizing:border-box;
-}
-#leftcontent li, .leftcontent li { background:#f8f8f8; padding:.5em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
-#leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; }
-#leftcontent li.active, .leftcontent li.active { font-weight:bold; }
-#leftcontent li:hover, .leftcontent li:hover { color:#333; background:#ddd; }
-#leftcontent a { height:100%; display:block; margin:0; padding:0 1em 0 0; float:left; }
-#rightcontent, .rightcontent { position:fixed; top:89px; left: 336px; overflow:auto }
-
-#controls + .leftcontent{
-	top: 44px;
-}
 
 #emptycontent {
 	font-size: 1.5em;
@@ -371,9 +352,9 @@ input[type="submit"].enabled {
 #body-login #header {
 	padding-top: 100px;
 }
-/* Fix background gradient */
 #body-login {
-	background-attachment: fixed;
+	background-attachment: fixed; /* fix background gradient */
+	height: 100%; /* fix sticky footer */
 }
 
 /* Dark subtle label text */
@@ -538,8 +519,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 }
 
 #body-login #showAdvanced > img {
-	height: 16px;
-	width: 16px;
 	padding: 4px;
 	box-sizing: border-box;
 }
diff --git a/core/img/places/folder.svg b/core/img/places/folder.svg
index edc9e7e208..7ac5d6ddf5 100644
--- a/core/img/places/folder.svg
+++ b/core/img/places/folder.svg
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
  <defs>
-  <linearGradient id="a" y2="1013.5" gradientUnits="userSpaceOnUse" y1="998.46" x2="209.34" x1="209.34">
+  <linearGradient id="a" y2="1013.5" gradientUnits="userSpaceOnUse" x2="209.34" y1="998.46" x1="209.34">
    <stop offset="0"/>
    <stop stop-color="#363636" offset="1"/>
   </linearGradient>
  </defs>
- <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
  <g transform="translate(-7.5118e-7 40)" fill-rule="evenodd">
   <g opacity=".6" transform="matrix(.86667 0 0 .86667 -172.04 -903.43)" fill="#fff">
-   <path fill="#fff" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/>
+   <path fill-rule="evenodd" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill="#fff"/>
   </g>
   <g opacity=".7" transform="matrix(.86667 0 0 .86667 -172.04 -904.43)" fill="url(#a)">
-   <path fill="url(#a)" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/>
+   <path fill-rule="evenodd" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill="url(#a)"/>
   </g>
  </g>
 </svg>
diff --git a/core/js/config.php b/core/js/config.php
index 7e23f3e2e4..33665b8401 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -25,6 +25,13 @@ foreach(OC_App::getEnabledApps() as $app) {
 	$apps_paths[$app] = OC_App::getAppWebPath($app);
 }
 
+$defaultExpireDateEnabled = \OCP\Config::getAppValue('core', 'shareapi_default_expire_date', 'no');
+$defaultExpireDate = $enforceDefaultExpireDate = null;
+if ($defaultExpireDateEnabled === 'yes') {
+	$defaultExpireDate = \OCP\Config::getAppValue('core', 'shareapi_expire_after_n_days', '7');
+	$enforceDefaultExpireDate = \OCP\Config::getAppValue('core', 'shareapi_enforce_expire_date', 'no');
+}
+
 $array = array(
 	"oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false',
 	"oc_isadmin" => OC_User::isAdminUser(OC_User::getUser()) ? 'true' : 'false',
@@ -67,6 +74,15 @@ $array = array(
 			'versionstring'		=> OC_Util::getVersionString(),
 		)
 	),
+	"oc_appconfig" => json_encode(
+			array("core" => array(
+				'defaultExpireDateEnabled' => $defaultExpireDateEnabled,
+				'defaultExpireDate' => $defaultExpireDate,
+				'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
+				'enforcePasswordForPublicLink' => \OCP\Util::isPublicLinkPasswordRequired(),
+				)
+			)
+	),
 	"oc_defaults" => json_encode(
 		array(
 			'entity' => $defaults->getEntity(),
diff --git a/core/js/core.json b/core/js/core.json
index 05c2a17a67..f1e0ba883d 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -14,6 +14,7 @@
 		"jquery.ocdialog.js",
 		"oc-dialogs.js",
 		"js.js",
+		"share.js",
 		"octemplate.js",
 		"eventsource.js",
 		"config.js",
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index 02cd6ac146..e2433f5f98 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -67,8 +67,8 @@
 				self.parent = self.$dialog.parent().length > 0 ? self.$dialog.parent() : $('body');
 				var pos = self.parent.position();
 				self.$dialog.css({
-					left: pos.left + (self.parent.width() - self.$dialog.outerWidth())/2,
-					top: pos.top + (self.parent.height() - self.$dialog.outerHeight())/2
+					left: pos.left + ($(window).innerWidth() - self.$dialog.outerWidth())/2,
+					top: pos.top + ($(window).innerHeight() - self.$dialog.outerHeight())/2
 				});
 			});
 
@@ -160,10 +160,16 @@
 			}
 			this.parent = this.$dialog.parent().length > 0 ? this.$dialog.parent() : $('body');
 			content_height = Math.min(content_height, this.parent.height()-20);
-			this.element.css({
-				height: content_height + 'px',
-				width: this.$dialog.innerWidth()-20 + 'px'
-			});
+			if (content_height> 0) {
+				this.element.css({
+					height: content_height + 'px',
+					width: this.$dialog.innerWidth()-20 + 'px'
+				});
+			} else {
+				this.element.css({
+					width : this.$dialog.innerWidth() - 20 + 'px'
+				});
+			}
 		},
 		_createOverlay: function() {
 			if(!this.options.modal) {
diff --git a/core/js/js.js b/core/js/js.js
index 0aa8d12b3d..38b9759043 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1250,9 +1250,12 @@ function relative_modified_date(timestamp) {
 }
 
 /**
- *  @todo Write documentation
+ * Utility functions
  */
 OC.Util = {
+	// TODO: remove original functions from global namespace
+	humanFileSize: humanFileSize,
+	formatDate: formatDate,
 	/**
 	 * Returns whether the browser supports SVG
 	 * @return {boolean} true if the browser supports SVG, false otherwise
@@ -1315,6 +1318,114 @@ OC.Util = {
 	}
 };
 
+/**
+ * Utility class for the history API,
+ * includes fallback to using the URL hash when
+ * the browser doesn't support the history API.
+ */
+OC.Util.History = {
+	_handlers: [],
+
+	/**
+	 * Push the current URL parameters to the history stack
+	 * and change the visible URL.
+	 * Note: this includes a workaround for IE8/IE9 that uses
+	 * the hash part instead of the search part.
+	 *
+	 * @param params to append to the URL, can be either a string
+	 * or a map
+	 */
+	pushState: function(params) {
+		var strParams;
+		if (typeof(params) === 'string') {
+			strParams = params;
+		}
+		else {
+			strParams = OC.buildQueryString(params);
+		}
+		if (window.history.pushState) {
+			var url = location.pathname + '?' + strParams;
+			window.history.pushState(params, '', url);
+		}
+		// use URL hash for IE8
+		else {
+			window.location.hash = '?' + strParams;
+			// inhibit next onhashchange that just added itself
+			// to the event queue
+			this._cancelPop = true;
+		}
+	},
+
+	/**
+	 * Add a popstate handler
+	 *
+	 * @param handler function
+	 */
+	addOnPopStateHandler: function(handler) {
+		this._handlers.push(handler);
+	},
+
+	/**
+	 * Parse a query string from the hash part of the URL.
+	 * (workaround for IE8 / IE9)
+	 */
+	_parseHashQuery: function() {
+		var hash = window.location.hash,
+			pos = hash.indexOf('?');
+		if (pos >= 0) {
+			return hash.substr(pos + 1);
+		}
+		return '';
+	},
+
+	_decodeQuery: function(query) {
+		return query.replace(/\+/g, ' ');
+	},
+
+	/**
+	 * Parse the query/search part of the URL.
+	 * Also try and parse it from the URL hash (for IE8)
+	 *
+	 * @return map of parameters
+	 */
+	parseUrlQuery: function() {
+		var query = this._parseHashQuery(),
+			params;
+		// try and parse from URL hash first
+		if (query) {
+			params = OC.parseQueryString(this._decodeQuery(query));
+		}
+		// else read from query attributes
+		if (!params) {
+			params = OC.parseQueryString(this._decodeQuery(location.search));
+		}
+		return params || {};
+	},
+
+	_onPopState: function(e) {
+		if (this._cancelPop) {
+			this._cancelPop = false;
+			return;
+		}
+		var params;
+		if (!this._handlers.length) {
+			return;
+		}
+		params = (e && e.state) || this.parseUrlQuery() || {};
+		for (var i = 0; i < this._handlers.length; i++) {
+			this._handlers[i](params);
+		}
+	}
+};
+
+// fallback to hashchange when no history support
+if (window.history.pushState) {
+	window.onpopstate = _.bind(OC.Util.History._onPopState, OC.Util.History);
+}
+else {
+	$(window).on('hashchange', _.bind(OC.Util.History._onPopState, OC.Util.History));
+}
+
 /**
  * Get a variable by name
  * @param {string} name
@@ -1364,6 +1475,11 @@ OC.set=function(name, value) {
 	}
 })();
 
+/**
+ * Namespace for apps
+ */
+window.OCA = {};
+
 /**
  * select a range in an input field
  * @link http://stackoverflow.com/questions/499126/jquery-set-cursor-position-in-text-area
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 11833f12e2..f6c17122d7 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -19,7 +19,7 @@
  *
  */
 
-/* global OC, t, alert */
+/* global OC, t, alert, $ */
 
 /**
  * this class to ease the usage of jquery dialogs
@@ -61,6 +61,65 @@ var OCdialogs = {
 	confirm:function(text, title, callback, modal) {
 		this.message(text, title, 'notice', OCdialogs.YES_NO_BUTTONS, callback, modal);
 	},
+	/**
+	 * displays prompt dialog
+	 * @param text content of dialog
+	 * @param title dialog title
+	 * @param callback which will be triggered when user presses YES or NO
+	 *        (true or false would be passed to callback respectively)
+	 * @param modal make the dialog modal
+	 * @param name name of the input field
+	 * @param password whether the input should be a password input
+	 */
+	prompt: function (text, title, callback, modal, name, password) {
+		$.when(this._getMessageTemplate()).then(function ($tmpl) {
+			var dialogName = 'oc-dialog-' + OCdialogs.dialogsCounter + '-content';
+			var dialogId = '#' + dialogName;
+			var $dlg = $tmpl.octemplate({
+				dialog_name: dialogName,
+				title      : title,
+				message    : text,
+				type       : 'notice'
+			});
+			var input = $('<input/>');
+			input.attr('type', password ? 'password' : 'text').attr('id', dialogName + '-input');
+			var label = $('<label/>').attr('for', dialogName + '-input').text(name + ': ');
+			$dlg.append(label);
+			$dlg.append(input);
+			if (modal === undefined) {
+				modal = false;
+			}
+			$('body').append($dlg);
+			var buttonlist = [
+				{
+					text         : t('core', 'Yes'),
+					click        : function () {
+						if (callback !== undefined) {
+							callback(true, input.val());
+						}
+						$(dialogId).ocdialog('close');
+					},
+					defaultButton: true
+				},
+				{
+					text : t('core', 'No'),
+					click: function () {
+						if (callback !== undefined) {
+							callback(false, input.val());
+						}
+						$(dialogId).ocdialog('close');
+					}
+				}
+			];
+
+			$(dialogId).ocdialog({
+				closeOnEscape: true,
+				modal        : modal,
+				buttons      : buttonlist
+			});
+			OCdialogs.dialogsCounter++;
+		});
+	},
 	/**
 	 * show a file picker to pick a file from
 	 * @param title dialog title
diff --git a/core/js/share.js b/core/js/share.js
index 2813570f71..583f92dd39 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -136,7 +136,21 @@ OC.Share={
 
 		return data;
 	},
-	share:function(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, callback) {
+	share:function(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, expirationDate, callback) {
+		// Add a fallback for old share() calls without expirationDate.
+		// We should remove this in a later version,
+		// after the Apps have been updated.
+		if (typeof callback === 'undefined' &&
+			typeof expirationDate === 'function') {
+			callback = expirationDate;
+			expirationDate = '';
+			console.warn(
+				"Call to 'OC.Share.share()' with too few arguments. " +
+				"'expirationDate' was assumed to be 'callback'. " +
+				"Please revisit the call and fix the list of arguments."
+			);
+		}
+
 		$.post(OC.filePath('core', 'ajax', 'share.php'),
 			{
 				action: 'share',
@@ -145,7 +159,8 @@ OC.Share={
 				shareType: shareType,
 				shareWith: shareWith,
 				permissions: permissions,
-				itemSourceName: itemSourceName
+				itemSourceName: itemSourceName,
+				expirationDate: expirationDate
 			}, function (result) {
 			if (result && result.status === 'success') {
 				if (callback) {
@@ -219,11 +234,22 @@ OC.Share={
 				html += '<div id="link">';
 				html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share link')+'</label>';
 				html += '<br />';
+
+				var defaultExpireMessage = '';
+				if ((itemType === 'folder' || itemType === 'file') && oc_appconfig.core.defaultExpireDateEnabled === 'yes') {
+					if (oc_appconfig.core.defaultExpireDateEnforced === 'yes') {
+						defaultExpireMessage = t('core', 'The public link will expire no later than {days} days after it is created',  {'days': oc_appconfig.core.defaultExpireDate}) + '<br/>';
+					} else {
+						defaultExpireMessage = t('core', 'By default the public link will expire after {days} days', {'days': oc_appconfig.core.defaultExpireDate}) + '<br/>';
+					}
+				}
+
 				html += '<input id="linkText" type="text" readonly="readonly" />';
 				html += '<input type="checkbox" name="showPassword" id="showPassword" value="1" style="display:none;" /><label for="showPassword" style="display:none;">'+t('core', 'Password protect')+'</label>';
 				html += '<div id="linkPass">';
-				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
+				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Choose a password for the public link')+'" />';
 				html += '</div>';
+
 				if (itemType === 'folder' && (possiblePermissions & OC.PERMISSION_CREATE) && publicUploadEnabled === 'yes') {
 					html += '<div id="allowPublicUploadWrapper" style="display:none;">';
 					html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
@@ -239,6 +265,7 @@ OC.Share={
 			html += '<div id="expiration">';
 			html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>';
 			html += '<input id="expirationDate" type="text" placeholder="'+t('core', 'Expiration date')+'" style="display:none; width:90%;" />';
+			html += '<div id="defaultExpireMessage">'+defaultExpireMessage+'</div>';
 			html += '</div>';
 			dropDownEl = $(html);
 			dropDownEl = dropDownEl.appendTo(appendTo);
@@ -291,6 +318,10 @@ OC.Share={
 				var itemType = $('#dropdown').data('item-type');
 				var itemSource = $('#dropdown').data('item-source');
 				var itemSourceName = $('#dropdown').data('item-source-name');
+				var expirationDate = '';
+				if ( $('#expirationCheckbox').is(':checked') === true ) {
+					expirationDate = $( "#expirationDate" ).val();
+				}
 				var shareType = selected.item.value.shareType;
 				var shareWith = selected.item.value.shareWith;
 				$(this).val(shareWith);
@@ -310,7 +341,7 @@ OC.Share={
 					permissions = permissions | OC.PERMISSION_SHARE;
 				}
 
-				OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, function() {
+				OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, expirationDate, function() {
 					OC.Share.addShareWith(shareType, shareWith, selected.item.label, permissions, possiblePermissions);
 					$('#shareWith').val('');
 					OC.Share.updateIcon(itemType, itemSource);
@@ -347,8 +378,8 @@ OC.Share={
 					}
 				})
 				.data("ui-autocomplete")._renderItem = function( ul, item ) {
-					return $( "<li>" )
-						.append( "<a>" + item.displayname + "<br>" + item.email + "</a>" )
+					return $('<li>')
+						.append('<a>' + escapeHTML(item.displayname) + "<br>" + escapeHTML(item.email) + '</a>' )
 						.appendTo( ul );
 				};
 			}
@@ -464,6 +495,10 @@ OC.Share={
 	showLink:function(token, password, itemSource) {
 		OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true;
 		$('#linkCheckbox').attr('checked', true);
+		
+		//check itemType
+		var linkSharetype=$('#dropdown').data('item-type');
+		
 		if (! token) {
 			//fallback to pre token link
 			var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
@@ -477,32 +512,43 @@ OC.Share={
 			var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+encodeURIComponent(file);
 		} else {
 			//TODO add path param when showing a link to file in a subfolder of a public link share
-			var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&t='+token;
+			var service='';
+			if(linkSharetype === 'folder' || linkSharetype === 'file'){
+				service='files';
+			}else{
+				service=linkSharetype;
+			}
+			
+			var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service='+service+'&t='+token;
+
 		}
 		$('#linkText').val(link);
 		$('#linkText').show('blind');
 		$('#linkText').css('display','block');
-		$('#showPassword').show();
-		$('#showPassword+label').show();
+		if (oc_appconfig.core.enforcePasswordForPublicLink === false || password === null) {
+			$('#showPassword').show();
+			$('#showPassword+label').show();
+		}
 		if (password != null) {
 			$('#linkPass').show('blind');
 			$('#showPassword').attr('checked', true);
 			$('#linkPassText').attr('placeholder', '**********');
 		}
 		$('#expiration').show();
+		$('#defaultExpireMessage').show();
 		$('#emailPrivateLink #email').show();
 		$('#emailPrivateLink #emailButton').show();
 		$('#allowPublicUploadWrapper').show();
 	},
 	hideLink:function() {
 		$('#linkText').hide('blind');
+		$('#defaultExpireMessage').hide();
 		$('#showPassword').hide();
 		$('#showPassword+label').hide();
-		$('#linkPass').hide();
+		$('#linkPass').hide('blind');
 		$('#emailPrivateLink #email').hide();
 		$('#emailPrivateLink #emailButton').hide();
 		$('#allowPublicUploadWrapper').hide();
-		$('#expirationDate').hide();
 	},
 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
@@ -628,22 +674,33 @@ $(document).ready(function() {
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
 		var itemSourceName = $('#dropdown').data('item-source-name');
+		var expirationDate = '';
+		if ($('#expirationCheckbox').is(':checked') === true) {
+			expirationDate = $( "#expirationDate" ).val();
+		}
 		if (this.checked) {
 			// Create a link
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, itemSourceName, function(data) {
-				OC.Share.showLink(data.token, null, itemSource);
-				OC.Share.updateIcon(itemType, itemSource);
-			});
+			if (oc_appconfig.core.enforcePasswordForPublicLink === false) {
+				OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, itemSourceName, expirationDate, function(data) {
+					OC.Share.showLink(data.token, null, itemSource);
+					OC.Share.updateIcon(itemType, itemSource);
+				});
+			} else {
+				$('#linkPass').toggle('blind');
+				$('#linkPassText').focus();
+			}
 		} else {
 			// Delete private link
-			OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
-				OC.Share.hideLink();
-				OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = false;
-				OC.Share.updateIcon(itemType, itemSource);
-				if (typeof OC.Share.statuses[itemSource] === 'undefined') {
-					$('#expiration').hide('blind');
-				}
-			});
+			OC.Share.hideLink();
+			if ($('#linkText').val() !== '') {
+				OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
+					OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = false;
+					OC.Share.updateIcon(itemType, itemSource);
+					if (typeof OC.Share.statuses[itemSource] === 'undefined') {
+						$('#expiration').hide('blind');
+					}
+				});
+			}
 		}
 	});
 
@@ -660,6 +717,10 @@ $(document).ready(function() {
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
 		var itemSourceName = $('#dropdown').data('item-source-name');
+		var expirationDate = '';
+		if ($('#expirationCheckbox').is(':checked') === true) {
+			expirationDate = $( "#expirationDate" ).val();
+		}
 		var permissions = 0;
 
 		// Calculate permissions
@@ -670,7 +731,7 @@ $(document).ready(function() {
 		}
 
 		// Update the share information
-		OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName, function(data) {
+		OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName, expirationDate, function(data) {
 		});
 	});
 
@@ -715,11 +776,16 @@ $(document).ready(function() {
 				permissions = OC.PERMISSION_READ;
 			}
 
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), permissions, itemSourceName, function() {
-				console.log("password set to: '" + linkPassText.val() +"' by event: " + event.type);
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), permissions, itemSourceName, function(data) {
 				linkPassText.val('');
 				linkPassText.attr('placeholder', t('core', 'Password protected'));
+
+				if (oc_appconfig.core.enforcePasswordForPublicLink) {
+					OC.Share.showLink(data.token, "password set", itemSource);
+					OC.Share.updateIcon(itemType, itemSource);
+				}
 			});
+
 		}
 	});
 
@@ -734,6 +800,9 @@ $(document).ready(function() {
 					OC.dialogs.alert(t('core', 'Error unsetting expiration date'), t('core', 'Error'));
 				}
 				$('#expirationDate').hide('blind');
+				if (oc_appconfig.core.defaultExpireDateEnforced === 'no') {
+					$('#defaultExpireMessage'). show('blind');
+				}
 			});
 		}
 	});
@@ -756,6 +825,10 @@ $(document).ready(function() {
 				expirationDateField.tipsy({gravity: 'n', fade: true});
 				expirationDateField.tipsy('show');
 				expirationDateField.addClass('error');
+			} else {
+				if (oc_appconfig.core.defaultExpireDateEnforced === 'no') {
+					$('#defaultExpireMessage'). hide('blind');
+				}
 			}
 		});
 	});
diff --git a/core/js/tests/specHelper.js b/core/js/tests/specHelper.js
index d86cd81cda..b9be9188a4 100644
--- a/core/js/tests/specHelper.js
+++ b/core/js/tests/specHelper.js
@@ -63,6 +63,9 @@ window.oc_config = {
 	session_lifetime: 600 * 1000,
 	session_keepalive: false
 };
+window.oc_appconfig = {
+	core: {}
+};
 window.oc_defaults = {};
 
 // global setup for all tests
diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js
index ccd9f7a128..65f768fbc5 100644
--- a/core/js/tests/specs/coreSpec.js
+++ b/core/js/tests/specs/coreSpec.js
@@ -474,5 +474,22 @@ describe('Core base tests', function() {
 			);
 		});
 	});
+	describe('Util', function() {
+		describe('humanFileSize', function() {
+			it('renders file sizes with the correct unit', function() {
+				var data = [
+					[0, '0 B'],
+					[125, '125 B'],
+					[128000, '125 kB'],
+					[128000000, '122.1 MB'],
+					[128000000000, '119.2 GB'],
+					[128000000000000, '116.4 TB']
+				];
+				for (var i = 0; i < data.length; i++) {
+					expect(OC.Util.humanFileSize(data[i][0])).toEqual(data[i][1]);
+				}
+			});
+		});
+	});
 });
 
diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js
new file mode 100644
index 0000000000..a487b71fdb
--- /dev/null
+++ b/core/js/tests/specs/shareSpec.js
@@ -0,0 +1,97 @@
+/**
+* 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_appconfig */
+describe('OC.Share tests', function() {
+	describe('dropdown', function() {
+		var $container;
+		var oldAppConfig;
+		var loadItemStub;
+		var autocompleteStub;
+		beforeEach(function() {
+			$('#testArea').append($('<div id="shareContainer"></div>'));
+			$container = $('#shareContainer');
+			/* jshint camelcase:false */
+			oldAppConfig = oc_appconfig.core;
+			loadItemStub = sinon.stub(OC.Share, 'loadItem');
+
+			loadItemStub.returns({
+				reshare: [],
+				shares: []
+			});
+
+			autocompleteStub = sinon.stub($.fn, 'autocomplete', function() {
+				// dummy container with the expected attributes
+				var $el = $('<div></div>').data('ui-autocomplete', {});
+				return $el;
+			});
+		});
+		afterEach(function() {
+			/* jshint camelcase:false */
+			oc_appconfig.core = oldAppConfig;
+			loadItemStub.restore();
+
+			autocompleteStub.restore();
+		});
+		it('calls loadItem with the correct arguments', function() {
+			OC.Share.showDropDown(
+				'file',
+			   	123,
+			   	$container,
+				'http://localhost/dummylink',
+				31,
+				'shared_file_name.txt'
+			);
+			expect(loadItemStub.calledOnce).toEqual(true);
+			expect(loadItemStub.calledWith('file', 123)).toEqual(true);
+		});
+		it('shows the dropdown with default values', function() {
+			var $el;
+			OC.Share.showDropDown(
+				'file',
+			   	123,
+			   	$container,
+				'http://localhost/dummylink',
+				31,
+				'shared_file_name.txt'
+			);
+			$el = $container.find('#dropdown');
+			expect($el.length).toEqual(1);
+			expect($el.attr('data-item-type')).toEqual('file');
+			expect($el.attr('data-item-source')).toEqual('123');
+			// TODO: expect that other parts are rendered correctly
+		});
+		it('shows default expiration date when set', function() {
+			oc_appconfig.core.defaultExpireDateEnabled = "yes";
+			oc_appconfig.core.defaultExpireDate = '';
+			// TODO: expect that default date was set
+		});
+		it('shows default expiration date is set but disabled', function() {
+			oc_appconfig.core.defaultExpireDateEnabled = "no";
+			oc_appconfig.core.defaultExpireDate = '';
+			// TODO: expect that default date was NOT set
+		});
+		// TODO: test password field visibility (whenever enforced or not)
+		// TODO: check link share field visibility based on whether it is allowed
+		// TODO: check public upload visibility based on config
+	});
+});
+
diff --git a/core/js/visitortimezone.js b/core/js/visitortimezone.js
index ee0105c783..d9b63a1087 100644
--- a/core/js/visitortimezone.js
+++ b/core/js/visitortimezone.js
@@ -1,4 +1,10 @@
 $(document).ready(function () {
 		var visitortimezone = (-new Date().getTimezoneOffset() / 60);
 		$('#timezone-offset').val(visitortimezone);
+
+		// only enable the submit button once we are sure that the timezone is set
+		var $loginForm = $('form[name="login"]');
+		if ($loginForm.length) {
+			$loginForm.find('input#submit').prop('disabled', false);
+		}
 });
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
index 9b24e2dcd4..91dd5db3cd 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -1,5 +1,9 @@
 <?php
 $TRANSLATIONS = array(
+"Expiration date is in the past." => "Verval datum is in die verlede.",
+"Turned on maintenance mode" => "Instandhouding aangeskakel",
+"Turned off maintenance mode" => "Instandhouding uitgeskakel",
+"No image or file provided" => "Geen prent of lêer voorsien",
 "Unknown filetype" => "Onbekende leertipe",
 "No temporary profile picture available, try again" => "Geen tydelike profiel foto beskikbaar nie, probeer weer",
 "Sunday" => "Sondag",
@@ -22,53 +26,66 @@ $TRANSLATIONS = array(
 "November" => "November",
 "December" => "Desember",
 "Settings" => "Instellings",
+"Saving..." => "Stoor...",
 "seconds ago" => "sekondes gelede",
 "_%n minute ago_::_%n minutes ago_" => array("%n minute gelede","%n minute gelede"),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("%n ure gelde","%n ure gelede"),
 "today" => "vandag",
 "yesterday" => "gister",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("%n dae gelede","%n dae gelede"),
 "last month" => "verlede maand",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n maande gelede","%n maande gelede"),
 "last year" => "verlede jaar",
 "years ago" => "jare gelede",
-"Choose" => "Kies",
 "Yes" => "Ja",
 "No" => "Nee",
+"Choose" => "Kies",
+"Ok" => "OK",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"New Files" => "Nuwe leêrs",
+"Already existing files" => "Bestaande leêrs",
 "Cancel" => "Kanseleer",
 "Continue" => "Gaan voort",
 "Very weak password" => "Baie swak wagwoord",
 "Weak password" => "Swak wagwoord",
+"So-so password" => "So-so wagwoord",
 "Good password" => "Goeie wagwoord",
 "Strong password" => "Sterk wagwoord",
 "Shared" => "Gedeel",
 "Share" => "Deel",
 "Error" => "Fout",
+"Error while sharing" => "Deel veroorsaak fout",
+"Error while unsharing" => "Deel terugneem veroorsaak fout",
 "Error while changing permissions" => "Fout met verandering van regte",
 "Shared with you and the group {group} by {owner}" => "Met jou en die groep {group} gedeel deur {owner}",
 "Shared with you by {owner}" => "Met jou gedeel deur {owner}",
 "Password protect" => "Beskerm met Wagwoord",
-"Password" => "Wagwoord",
 "Allow Public Upload" => "Laat Publieke Oplaai toe",
 "Email link to person" => "E-pos aan persoon",
 "Send" => "Stuur",
 "Set expiration date" => "Stel verval datum",
 "Expiration date" => "Verval datum",
+"Share via email:" => "Deel oor epos:",
+"No people found" => "Geen persoon gevind",
 "group" => "groep",
+"Resharing is not allowed" => "Hernieu deel is nie toegelaat nie ",
 "Shared in {item} with {user}" => "Gedeel in {item} met {user}",
+"Unshare" => "Deel terug neem",
 "can edit" => "kan wysig",
 "access control" => "toegang beheer",
 "create" => "skep",
 "update" => "opdateer",
 "delete" => "uitvee",
 "share" => "deel",
-"Password protected" => "Beskerm met Wagwoord",
+"Password protected" => "Beskerm met wagwoord",
+"Error unsetting expiration date" => "Fout met skrapping van verval datum",
 "Error setting expiration date" => "Fout met opstel van verval datum",
 "Sending ..." => "Stuur ...",
 "Email sent" => "E-pos gestuur",
+"The object type is not specified." => "Hierdie objek tipe is nie gespesifiseer nie.",
 "Add" => "Voeg by",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Die opdateering was nie suksesvol nie. Raporteer die probleem by <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Die opdatering was nie suksesvol nie. Rapporteer die probleem by <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
 "%s password reset" => "%s wagwoord herstel",
 "Use the following link to reset your password: {link}" => "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
 "Request failed!<br>Did you make sure your email/username was right?" => "Versoek het gefaal!<br>Het jy seker gemaak jou e-pos/gebruiker naam is korrek?",
@@ -79,6 +96,7 @@ $TRANSLATIONS = array(
 "To login page" => "Na aanteken-bladsy",
 "New password" => "Nuwe wagwoord",
 "Reset password" => "Herstel wagwoord",
+"For the best results, please consider using a GNU/Linux server instead." => "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate.",
 "Personal" => "Persoonlik",
 "Users" => "Gebruikers",
 "Apps" => "Toepassings",
@@ -89,9 +107,12 @@ $TRANSLATIONS = array(
 "Security Warning" => "Sekuriteits waarskuwing",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jou PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Opdateer asseblief jou PHP instelasie om %s veilig te gebruik",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Geen moontlikheid om 'n ewekansige getal genereer nie. Stel asb. die PHP OpenSSL byvoeging in werking.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sonder die moontlikheid om 'n ewekansige getal te genereer kan 'n aanvaller wagwoord herstel tekens voorspel en jou rekening oor neem.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Jou data gids en leers is moontlik toeganklik vanaf die internet omdat die .htaccess leer nie werk nie.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.",
 "Create an <strong>admin account</strong>" => "Skep `n <strong>admin-rekening</strong>",
+"Password" => "Wagwoord",
 "Data folder" => "Data vouer",
 "Configure the database" => "Stel databasis op",
 "will be used" => "sal gebruik word",
@@ -104,9 +125,13 @@ $TRANSLATIONS = array(
 "%s is available. Get more information on how to update." => "%s is beskikbaar. Kry meer inligting oor opdatering.",
 "Log out" => "Teken uit",
 "Automatic logon rejected!" => "Automatiese aantekening afgekeur!",
+"If you did not change your password recently, your account may be compromised!" => "Jou rekening kan gekompromitteer wees, as jy jou wagwoord nie onlangs verander het nie.",
 "Please change your password to secure your account again." => "Verander asseblief jou wagwoord om jou rekening te beveilig",
 "Lost your password?" => "Wagwoord verloor?",
 "remember" => "onthou",
-"Log in" => "Teken aan"
+"Log in" => "Teken aan",
+"Alternative Logins" => "Alternatiewe aantekeninge",
+"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>" => "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>",
+"Updating ownCloud to version %s, this may take a while." => "Opdatering a ownCloud versie %s - dit kan 'n tydjie vat."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index b29a661ec6..1eeb7f1eac 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Updated database" => "قاعدة بيانات المرفوعات",
 "Unknown filetype" => "نوع الملف غير معروف",
 "Invalid image" => "الصورة غير صالحة",
 "Sunday" => "الأحد",
@@ -33,9 +34,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","","","","",""),
 "last year" => "السنةالماضية",
 "years ago" => "سنة مضت",
-"Choose" => "اختيار",
 "Yes" => "نعم",
 "No" => "لا",
+"Choose" => "اختيار",
 "Ok" => "موافق",
 "_{count} file conflict_::_{count} file conflicts_" => array("","","","","",""),
 "Cancel" => "الغاء",
@@ -53,7 +54,7 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "شورك معك من قبل {owner}",
 "Share link" => "شارك الرابط",
 "Password protect" => "حماية كلمة السر",
-"Password" => "كلمة المرور",
+"Allow Public Upload" => "اسمح بالرفع للعامة",
 "Email link to person" => "ارسل الرابط بالبريد الى صديق",
 "Send" => "أرسل",
 "Set expiration date" => "تعيين تاريخ إنتهاء الصلاحية",
@@ -107,6 +108,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "مجلدات البيانات والملفات الخاصة قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت وذلك بسبب ان ملف .htaccess  لا يعمل بشكل صحيح.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "لمزيد من المعلومات عن كيفية إعداد خادمك، يرجى الاطلاع على <a href=\"%s\" target=\"_blank\">صفحة المساعدة</a>.",
 "Create an <strong>admin account</strong>" => "أضف </strong>مستخدم رئيسي <strong>",
+"Password" => "كلمة المرور",
 "Data folder" => "مجلد المعلومات",
 "Configure the database" => "أسس قاعدة البيانات",
 "will be used" => "سيتم استخدمه",
diff --git a/core/l10n/ast.php b/core/l10n/ast.php
index fd4a539c0b..f0e1a03949 100644
--- a/core/l10n/ast.php
+++ b/core/l10n/ast.php
@@ -33,20 +33,38 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("fai %n mes","fai %n meses"),
 "last year" => "añu caberu",
 "years ago" => "fai años",
-"Choose" => "Esbillar",
 "Yes" => "Sí",
 "No" => "Non",
+"Choose" => "Esbillar",
+"Ok" => "Aceutar",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Which files do you want to keep?" => "¿Qué ficheros quies caltener?",
 "Cancel" => "Encaboxar",
 "Continue" => "Continuar",
+"Very weak password" => "Contraseña mui feble",
+"Weak password" => "Contraseña feble",
+"So-so password" => "Contraseña pasable",
+"Good password" => "Contraseña bona",
+"Strong password" => "Contraseña mui bona",
 "Shared" => "Compartíu",
 "Share" => "Compartir",
 "Error" => "Fallu",
+"Error while sharing" => "Fallu mientres la compartición",
+"Error while unsharing" => "Fallu mientres se dexaba de compartir",
+"Error while changing permissions" => "Fallu mientres camudaben los permisos",
+"Shared with you and the group {group} by {owner}" => "Compartíu contigo y col grupu {group} por {owner}",
+"Shared with you by {owner}" => "Compartíu contigo por {owner}",
 "Share link" => "Compartir enllaz",
-"Password" => "Contraseña",
+"Password protect" => "Protexer con contraseña",
+"Email link to person" => "Enlláz de corréu electrónicu a la persona",
 "Send" => "Unviar",
+"Set expiration date" => "Afitar la data de caducidá",
+"Expiration date" => "Data de caducidá",
+"Share via email:" => "Compartir vía corréu electrónicu:",
+"No people found" => "Nun s'atoparon persones",
 "group" => "grupu",
+"Resharing is not allowed" => "Recompartir nun ta permitíu",
+"Shared in {item} with {user}" => "Compartíu en {item} con {user}",
 "Unshare" => "Dexar de compartir",
 "notify by email" => "notificar per corréu",
 "can edit" => "pue editar",
@@ -56,20 +74,52 @@ $TRANSLATIONS = array(
 "delete" => "desaniciar",
 "share" => "compartir",
 "Password protected" => "Contraseña protexida",
+"Error unsetting expiration date" => "Fallu desafitando la data de caducidá",
+"Error setting expiration date" => "Fallu afitando la fecha de caducidá",
+"Sending ..." => "Unviando ...",
 "Email sent" => "Corréu unviáu",
 "Warning" => "Avisu",
+"The object type is not specified." => "El tipu d'oxetu nun ta especificáu.",
 "Delete" => "Desaniciar",
 "Add" => "Amestar",
 "Edit tags" => "Editar etiquetes",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'anovamientu fízose con ésitu. Por favor, informa d'esti problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comuña ownCloud</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.",
+"Use the following link to reset your password: {link}" => "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}",
+"You will receive a link to reset your password via Email." => "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña",
 "Username" => "Nome d'usuariu",
 "Reset" => "Reaniciar",
+"Your password was reset" => "Restablecióse la contraseña",
+"To login page" => "Aniciar sesión na páxina",
+"New password" => "Contraseña nueva",
+"Reset password" => "Restablecer contraseña",
 "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",
+"Apps" => "Aplicaciones",
+"Admin" => "Alministrador",
+"Help" => "Ayuda",
+"Access forbidden" => "Accesu denegáu",
+"Cloud not found" => "Ñube non atopada",
 "Cheers!" => "¡Salú!",
+"Security Warning" => "Avisu de seguridá",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nun ta disponible'l xenerador de númberos al debalu, por favor activa la estensión PHP OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ensin un xenerador de númberos al debalu, un atacante podría aldovinar los tokens pa restablecer la contraseña y tomar el control de la cuenta.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.",
+"Create an <strong>admin account</strong>" => "Crea una <strong>cuenta d'alministrador</strong>",
+"Password" => "Contraseña",
+"Data folder" => "Carpeta de datos",
+"Configure the database" => "Configura la base de datos",
 "will be used" => "usaráse",
+"Database user" => "Usuariu de la base de datos",
+"Database password" => "Contraseña de la base de datos",
+"Database name" => "Nome de la base de datos",
+"Database tablespace" => "Espaciu de tables de la base de datos",
+"Database host" => "Agospiador de la base de datos",
+"Finish setup" => "Finar la configuración ",
 "Finishing …" => "Finando ...",
 "Log out" => "Zarrar sesión",
+"Automatic logon rejected!" => "¡Aniciu de sesión automáticu refugáu!",
 "Lost your password?" => "¿Escaeciesti la to contraseña?",
 "Log in" => "Aniciar sesión",
 "Alternative Logins" => "Anicios de sesión alternativos",
diff --git a/core/l10n/be.php b/core/l10n/be.php
index 383d2494d2..d0c3b3ecba 100644
--- a/core/l10n/be.php
+++ b/core/l10n/be.php
@@ -30,9 +30,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","","",""),
 "last year" => "У мінулым годзе",
 "years ago" => "Гадоў таму",
-"Choose" => "Выбар",
 "Yes" => "Так",
 "No" => "Не",
+"Choose" => "Выбар",
 "Ok" => "Добра",
 "_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
 "Error" => "Памылка",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 861d7370ed..8653f2435c 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "последната година",
 "years ago" => "последните години",
-"Choose" => "Избери",
 "Yes" => "Да",
 "No" => "Не",
+"Choose" => "Избери",
 "Ok" => "Добре",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Отказ",
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "Споделено с тебе и група {group} от {owner}",
 "Shared with you by {owner}" => "Споделено с тебе от {owner}",
 "Password protect" => "Защитено с парола",
-"Password" => "Парола",
 "Email link to person" => "Изпрати връзка до пощата на някои",
 "Send" => "Изпрати",
 "Set expiration date" => "Посочи дата на изтичане",
@@ -85,6 +84,7 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Достъпът е забранен",
 "Cloud not found" => "облакът не намерен",
 "Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>",
+"Password" => "Парола",
 "Data folder" => "Директория за данни",
 "Configure the database" => "Конфигуриране на базата",
 "will be used" => "ще се ползва",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index e9f46d686c..c7a1c6545b 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "গত বছর",
 "years ago" => "বছর পূর্বে",
-"Choose" => "বেছে নিন",
 "Yes" => "হ্যাঁ",
 "No" => "না",
+"Choose" => "বেছে নিন",
 "Ok" => "তথাস্তু",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "বাতির",
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন",
 "Shared with you by {owner}" => "{owner} আপনার সাথে ভাগাভাগি করেছেন",
 "Password protect" => "কূটশব্দ সুরক্ষিত",
-"Password" => "কূটশব্দ",
 "Email link to person" => "ব্যক্তির সাথে ই-মেইল যুক্ত কর",
 "Send" => "পাঠাও",
 "Set expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন",
@@ -87,6 +86,7 @@ $TRANSLATIONS = array(
 "Cloud not found" => "ক্লাউড খুঁজে পাওয়া গেল না",
 "Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
 "Create an <strong>admin account</strong>" => "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
+"Password" => "কূটশব্দ",
 "Data folder" => "ডাটা ফোল্ডার ",
 "Configure the database" => "ডাটাবেচ কনফিগার করুন",
 "will be used" => "ব্যবহৃত হবে",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index d4adb682f8..455b57f4f9 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("fa %n mes","fa %n mesos"),
 "last year" => "l'any passat",
 "years ago" => "anys enrere",
-"Choose" => "Escull",
-"Error loading file picker template: {error}" => "Error en carregar la plantilla de càrrega de fitxers: {error}",
 "Yes" => "Sí",
 "No" => "No",
+"Choose" => "Escull",
+"Error loading file picker template: {error}" => "Error en carregar la plantilla de càrrega de fitxers: {error}",
 "Ok" => "D'acord",
 "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"),
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Comparteix amb usuari o grup...",
 "Share link" => "Enllaç de compartició",
 "Password protect" => "Protegir amb contrasenya",
-"Password" => "Contrasenya",
 "Allow Public Upload" => "Permet pujada pública",
 "Email link to person" => "Enllaç per correu electrónic amb la persona",
 "Send" => "Envia",
@@ -150,6 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
 "Create an <strong>admin account</strong>" => "Crea un <strong>compte d'administrador</strong>",
+"Password" => "Contrasenya",
 "Storage & database" => "Emmagatzematge i base de dades",
 "Data folder" => "Carpeta de dades",
 "Configure the database" => "Configura la base de dades",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 46b8de6bac..d4ca4acd5e 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -41,16 +41,16 @@ $TRANSLATIONS = array(
 "_%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",
-"Choose" => "Vybrat",
-"Error loading file picker template: {error}" => "Chyba při nahrávání šablony výběru souborů: {error}",
 "Yes" => "Ano",
 "No" => "Ne",
+"Choose" => "Vybrat",
+"Error loading file picker template: {error}" => "Chyba při nahrávání šablony výběru souborů: {error}",
 "Ok" => "Ok",
 "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",
-"Already existing files" => "Soubory již existují",
+"Already existing files" => "Již existující 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",
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Sdílet s uživatelem nebo skupinou",
 "Share link" => "Sdílet odkaz",
 "Password protect" => "Chránit heslem",
-"Password" => "Heslo",
 "Allow Public Upload" => "Povolit veřejné nahrávání",
 "Email link to person" => "Odeslat osobě odkaz e-mailem",
 "Send" => "Odeslat",
@@ -150,6 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
 "Create an <strong>admin account</strong>" => "Vytvořit <strong>účet správce</strong>",
+"Password" => "Heslo",
 "Storage & database" => "Úložiště & databáze",
 "Data folder" => "Složka s daty",
 "Configure the database" => "Nastavit databázi",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index b79c1d5df5..737f9aa7c1 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","","",""),
 "last year" => "y llynedd",
 "years ago" => "blwyddyn yn ôl",
-"Choose" => "Dewisiwch",
 "Yes" => "Ie",
 "No" => "Na",
+"Choose" => "Dewisiwch",
 "Ok" => "Iawn",
 "_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
 "Cancel" => "Diddymu",
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "Rhannwyd â chi a'r grŵp {group} gan {owner}",
 "Shared with you by {owner}" => "Rhannwyd â chi gan {owner}",
 "Password protect" => "Diogelu cyfrinair",
-"Password" => "Cyfrinair",
 "Email link to person" => "E-bostio dolen at berson",
 "Send" => "Anfon",
 "Set expiration date" => "Gosod dyddiad dod i ben",
@@ -96,6 +95,7 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Heb gynhyrchydd rhifau hap diogel efallai y gall ymosodwr ragweld tocynnau ailosod cyfrinair a meddiannu eich cyfrif.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
 "Create an <strong>admin account</strong>" => "Crewch <strong>gyfrif gweinyddol</strong>",
+"Password" => "Cyfrinair",
 "Data folder" => "Plygell data",
 "Configure the database" => "Cyflunio'r gronfa ddata",
 "will be used" => "ddefnyddir",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 9991e3e490..99b5c23973 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Expiration date is in the past." => "Udløbsdatoen er overskredet.",
 "Couldn't send mail to following users: %s " => "Kunne ikke sende mail til følgende brugere: %s",
 "Turned on maintenance mode" => "Startede vedligeholdelsestilstand",
 "Turned off maintenance mode" => "standsede vedligeholdelsestilstand",
@@ -40,15 +41,16 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n måned siden","%n måneder siden"),
 "last year" => "sidste år",
 "years ago" => "år siden",
-"Choose" => "Vælg",
-"Error loading file picker template: {error}" => "Fejl ved indlæsning af filvælger skabelon: {error}",
 "Yes" => "Ja",
 "No" => "Nej",
+"Choose" => "Vælg",
+"Error loading file picker template: {error}" => "Fejl ved indlæsning af filvælger skabelon: {error}",
 "Ok" => "OK",
 "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",
+"Already existing files" => "Allerede eksisterende 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",
@@ -72,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Del med bruger eller gruppe ...",
 "Share link" => "Del link",
 "Password protect" => "Beskyt med adgangskode",
-"Password" => "Kodeord",
 "Allow Public Upload" => "Tillad Offentlig Upload",
 "Email link to person" => "E-mail link til person",
 "Send" => "Send",
@@ -121,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "Til login-side",
 "New password" => "Nyt kodeord",
 "Reset password" => "Nulstil kodeord",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!",
+"For the best results, please consider using a GNU/Linux server instead." => "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.",
 "Personal" => "Personligt",
 "Users" => "Brugere",
 "Apps" => "Apps",
@@ -146,6 +149,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>",
+"Password" => "Kodeord",
 "Storage & database" => "Lager & database",
 "Data folder" => "Datamappe",
 "Configure the database" => "Konfigurer databasen",
@@ -169,6 +173,7 @@ $TRANSLATIONS = array(
 "remember" => "husk",
 "Log in" => "Log ind",
 "Alternative Logins" => "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>" => "Hej med dig,<br><br>Dette er blot for at informere dig om, at %s har delt <strong>%s</strong> med dig.<br><a href=\"%s\">Se det her!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Denne ownCloud instans er lige nu i enkeltbruger tilstand.",
 "This means only administrators can use the instance." => "Det betyder at det kun er administrator, som kan benytte ownCloud.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakt systemadministratoren, hvis denne meddelelse fortsætter eller optrådte uventet.",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 7a0aecf4d5..c3f912bdc9 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
-"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
 "Yes" => "Ja",
 "No" => "Nein",
+"Choose" => "Auswählen",
+"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
 "Ok" => "OK",
 "Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "{owner} hat dies mit Dir geteilt",
 "Share with user or group …" => "Mit Benutzer oder Gruppe teilen ....",
 "Share link" => "Link Teilen",
+"The public link will expire no later than {days} days after it is created" => "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
+"By default the public link will expire after {days} days" => "Standardmäßig wird der öffentliche Link nach {days} Tagen ablaufen",
 "Password protect" => "Passwortschutz",
-"Password" => "Passwort",
+"Choose a password for the public link" => "Wählen Sie ein Passwort für den öffentlichen Link",
 "Allow Public Upload" => "Öffentliches Hochladen erlauben",
 "Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
+"Password" => "Passwort",
 "Storage & database" => "Speicher & Datenbank",
 "Data folder" => "Datenverzeichnis",
 "Configure the database" => "Datenbank einrichten",
diff --git a/core/l10n/de_AT.php b/core/l10n/de_AT.php
index 54c3946342..18a4adb948 100644
--- a/core/l10n/de_AT.php
+++ b/core/l10n/de_AT.php
@@ -27,11 +27,11 @@ $TRANSLATIONS = array(
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Abbrechen",
 "Share" => "Freigeben",
-"Password" => "Passwort",
 "group" => "Gruppe",
 "Unshare" => "Teilung zurücknehmen",
 "can edit" => "kann bearbeiten",
 "Delete" => "Löschen",
-"Personal" => "Persönlich"
+"Personal" => "Persönlich",
+"Password" => "Passwort"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
index 1a2c56635c..a0c303b6cd 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
 "Yes" => "Ja",
 "No" => "Nein",
+"Choose" => "Auswählen",
 "Ok" => "OK",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "New Files" => "Neue Dateien",
@@ -50,7 +50,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
 "Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.",
 "Password protect" => "Passwortschutz",
-"Password" => "Passwort",
 "Allow Public Upload" => "Öffentliches Hochladen erlauben",
 "Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
@@ -107,6 +106,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
+"Password" => "Passwort",
 "Data folder" => "Datenverzeichnis",
 "Configure the database" => "Datenbank einrichten",
 "will be used" => "wird verwendet",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index b8bce778f8..b638d1a4c8 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
-"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
 "Yes" => "Ja",
 "No" => "Nein",
+"Choose" => "Auswählen",
+"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
 "Ok" => "OK",
 "Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.",
 "Share with user or group …" => "Mit Benutzer oder Gruppe teilen ....",
 "Share link" => "Link teilen",
+"The public link will expire no later than {days} days after it is created" => "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
+"By default the public link will expire after {days} days" => "Standardmäßig wird der öffentliche Link nach {days} Tagen ablaufen",
 "Password protect" => "Passwortschutz",
-"Password" => "Passwort",
+"Choose a password for the public link" => "Wählen Sie ein Passwort für den öffentlichen Link",
 "Allow Public Upload" => "Öffentliches Hochladen erlauben",
 "Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
+"Password" => "Passwort",
 "Storage & database" => "Speicher & Datenbank",
 "Data folder" => "Datenverzeichnis",
 "Configure the database" => "Datenbank einrichten",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index c9506fda05..fc754d9309 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -41,15 +41,16 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n μήνας πριν","%n μήνες πριν"),
 "last year" => "τελευταίο χρόνο",
 "years ago" => "χρόνια πριν",
-"Choose" => "Επιλέξτε",
-"Error loading file picker template: {error}" => "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}",
 "Yes" => "Ναι",
 "No" => "Όχι",
+"Choose" => "Επιλέξτε",
+"Error loading file picker template: {error}" => "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}",
 "Ok" => "Οκ",
 "Error loading message template: {error}" => "Σφάλμα φόρτωσης προτύπου μηνυμάτων: {σφάλμα}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} αρχείο διαφέρει","{count} αρχεία διαφέρουν"),
 "One file conflict" => "Ένα αρχείο διαφέρει",
 "New Files" => "Νέα Αρχεία",
+"Already existing 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" => "Άκυρο",
@@ -72,8 +73,9 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Διαμοιράστηκε με σας από τον {owner}",
 "Share with user or group …" => "Διαμοιρασμός με χρήστη ή ομάδα ...",
 "Share link" => "Διαμοιρασμός συνδέσμου",
+"The public link will expire no later than {days} days after it is created" => "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του",
+"By default the public link will expire after {days} days" => "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί ερήμην μετά από {days} ημέρες",
 "Password protect" => "Προστασία συνθηματικού",
-"Password" => "Συνθηματικό",
 "Allow Public Upload" => "Επιτρέπεται η Δημόσια Αποστολή",
 "Email link to person" => "Αποστολή συνδέσμου με email ",
 "Send" => "Αποστολή",
@@ -149,6 +151,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>",
+"Password" => "Συνθηματικό",
 "Storage & database" => "Αποθήκευση & βάση δεδομένων",
 "Data folder" => "Φάκελος δεδομένων",
 "Configure the database" => "Ρύθμιση της βάσης δεδομένων",
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
index 016bf23e8e..122e2dec10 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n month ago","%n months ago"),
 "last year" => "last year",
 "years ago" => "years ago",
-"Choose" => "Choose",
-"Error loading file picker template: {error}" => "Error loading file picker template: {error}",
 "Yes" => "Yes",
 "No" => "No",
+"Choose" => "Choose",
+"Error loading file picker template: {error}" => "Error loading file picker template: {error}",
 "Ok" => "OK",
 "Error loading message template: {error}" => "Error loading message template: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} file conflict","{count} file conflicts"),
@@ -73,8 +73,9 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Shared with you by {owner}",
 "Share with user or group …" => "Share with user or group …",
 "Share link" => "Share link",
+"The public link will expire no later than {days} days after it is created" => "The public link will expire no later than {days} days after it is created",
+"By default the public link will expire after {days} days" => "By default the public link will expire after {days} days",
 "Password protect" => "Password protect",
-"Password" => "Password",
 "Allow Public Upload" => "Allow Public Upload",
 "Email link to person" => "Email link to person",
 "Send" => "Send",
@@ -150,6 +151,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
 "Create an <strong>admin account</strong>" => "Create an <strong>admin account</strong>",
+"Password" => "Password",
 "Storage & database" => "Storage & database",
 "Data folder" => "Data folder",
 "Configure the database" => "Configure the database",
diff --git a/core/l10n/en_NZ.php b/core/l10n/en_NZ.php
new file mode 100644
index 0000000000..ffcdde48d4
--- /dev/null
+++ b/core/l10n/en_NZ.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/eo.php b/core/l10n/eo.php
index 19d330e5c2..7f57facc52 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("antaŭ %n monato","antaŭ %n monatoj"),
 "last year" => "lastajare",
 "years ago" => "jaroj antaŭe",
-"Choose" => "Elekti",
 "Yes" => "Jes",
 "No" => "Ne",
+"Choose" => "Elekti",
 "Ok" => "Akcepti",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} dosierkonflikto","{count} dosierkonfliktoj"),
 "One file conflict" => "Unu dosierkonflikto",
@@ -57,7 +57,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Kunhavigi kun uzanto aŭ grupo...",
 "Share link" => "Konhavigi ligilon",
 "Password protect" => "Protekti per pasvorto",
-"Password" => "Pasvorto",
 "Email link to person" => "Retpoŝti la ligilon al ulo",
 "Send" => "Sendi",
 "Set expiration date" => "Agordi limdaton",
@@ -116,6 +115,7 @@ $TRANSLATIONS = array(
 "Please update your PHP installation to use %s securely." => "Bonvolu ĝisdatigi vian PHP-instalon por uzi %s sekure.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaĵon por PHP.",
 "Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>",
+"Password" => "Pasvorto",
 "Data folder" => "Datuma dosierujo",
 "Configure the database" => "Agordi la datumbazon",
 "will be used" => "estos uzata",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 53d2a9f4c2..e64ad6aa29 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -31,20 +31,20 @@ $TRANSLATIONS = array(
 "December" => "Diciembre",
 "Settings" => "Ajustes",
 "Saving..." => "Guardando...",
-"seconds ago" => "segundos antes",
-"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
-"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
+"seconds ago" => "hace segundos",
+"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","hace %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","hace %n horas"),
 "today" => "hoy",
 "yesterday" => "ayer",
-"_%n day ago_::_%n days ago_" => array("Hace %n día","Hace %n días"),
+"_%n day ago_::_%n days ago_" => array("Hace %n día","hace %n días"),
 "last month" => "el mes pasado",
-"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
+"_%n month ago_::_%n months ago_" => array("Hace %n mes","hace %n meses"),
 "last year" => "el año pasado",
-"years ago" => "años antes",
-"Choose" => "Seleccionar",
-"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
+"years ago" => "hace años",
 "Yes" => "Sí",
 "No" => "No",
+"Choose" => "Seleccionar",
+"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
 "Ok" => "Aceptar",
 "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"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Compartido contigo por {owner}",
 "Share with user or group …" => "Compartido con el usuario o con el grupo ...",
 "Share link" => "Enlace compartido",
+"The public link will expire no later than {days} days after it is created" => "El link publico no expirará antes de {days} desde que fué creado",
+"By default the public link will expire after {days} days" => "El link publico expirará por defecto pasados {days} dias",
 "Password protect" => "Protección con contraseña",
-"Password" => "Contraseña",
+"Choose a password for the public link" => "Elija una contraseña para el enlace publico",
 "Allow Public Upload" => "Permitir Subida Pública",
 "Email link to person" => "Enviar enlace por correo electrónico a una persona",
 "Send" => "Enviar",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
+"Password" => "Contraseña",
 "Storage & database" => "Almacenamiento y base de datos",
 "Data folder" => "Directorio de datos",
 "Configure the database" => "Configurar la base de datos",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 1bf43449fd..b287d3769e 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "_%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",
-"Choose" => "Elegir",
-"Error loading file picker template: {error}" => "Error cargando la plantilla del selector de archivo: {error}",
 "Yes" => "Sí",
 "No" => "No",
+"Choose" => "Elegir",
+"Error loading file picker template: {error}" => "Error cargando la plantilla del selector de archivo: {error}",
 "Ok" => "Aceptar",
 "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"),
@@ -72,7 +72,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Compartir con usuario o grupo ...",
 "Share link" => "Compartir vínculo",
 "Password protect" => "Proteger con contraseña ",
-"Password" => "Contraseña",
 "Allow Public Upload" => "Permitir Subida Pública",
 "Email link to person" => "Enviar el enlace por e-mail.",
 "Send" => "Mandar",
@@ -145,6 +144,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
+"Password" => "Contraseña",
 "Data folder" => "Directorio de almacenamiento",
 "Configure the database" => "Configurar la base de datos",
 "will be used" => "se usarán",
diff --git a/core/l10n/es_BO.php b/core/l10n/es_BO.php
new file mode 100644
index 0000000000..ffcdde48d4
--- /dev/null
+++ b/core/l10n/es_BO.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/es_CL.php b/core/l10n/es_CL.php
index cab130cbd3..05588a6d67 100644
--- a/core/l10n/es_CL.php
+++ b/core/l10n/es_CL.php
@@ -30,9 +30,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "último año",
 "years ago" => "años anteriores",
-"Choose" => "Choose",
 "Yes" => "Si",
 "No" => "No",
+"Choose" => "Choose",
 "Ok" => "Ok",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Cancelar",
@@ -42,8 +42,8 @@ $TRANSLATIONS = array(
 "Error while sharing" => "Ocurrió un error mientras compartía",
 "Error while unsharing" => "Ocurrió un error mientras dejaba de compartir",
 "Error while changing permissions" => "Ocurrió un error mientras se cambiaban los permisos",
-"Password" => "Clave",
 "The object type is not specified." => "El tipo de objeto no está especificado.",
-"Username" => "Usuario"
+"Username" => "Usuario",
+"Password" => "Clave"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_CO.php b/core/l10n/es_CO.php
new file mode 100644
index 0000000000..ffcdde48d4
--- /dev/null
+++ b/core/l10n/es_CO.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/es_EC.php b/core/l10n/es_EC.php
new file mode 100644
index 0000000000..ffcdde48d4
--- /dev/null
+++ b/core/l10n/es_EC.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/es_MX.php b/core/l10n/es_MX.php
index dca69ebaa3..e19724fa45 100644
--- a/core/l10n/es_MX.php
+++ b/core/l10n/es_MX.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
 "last year" => "el año pasado",
 "years ago" => "años antes",
-"Choose" => "Seleccionar",
-"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
 "Yes" => "Sí",
 "No" => "No",
+"Choose" => "Seleccionar",
+"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
 "Ok" => "Aceptar",
 "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"),
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Compartido con el usuario o con el grupo …",
 "Share link" => "Enlace compartido",
 "Password protect" => "Protección con contraseña",
-"Password" => "Contraseña",
 "Allow Public Upload" => "Permitir Subida Pública",
 "Email link to person" => "Enviar enlace por correo electrónico a una persona",
 "Send" => "Enviar",
@@ -139,6 +138,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
+"Password" => "Contraseña",
 "Data folder" => "Directorio de datos",
 "Configure the database" => "Configurar la base de datos",
 "will be used" => "se utilizarán",
diff --git a/core/l10n/es_PE.php b/core/l10n/es_PE.php
new file mode 100644
index 0000000000..ffcdde48d4
--- /dev/null
+++ b/core/l10n/es_PE.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/es_UY.php b/core/l10n/es_UY.php
new file mode 100644
index 0000000000..ffcdde48d4
--- /dev/null
+++ b/core/l10n/es_UY.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/et_EE.php b/core/l10n/et_EE.php
index 4807bc0414..86f60c8c5c 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n kuu tagasi","%n kuud tagasi"),
 "last year" => "viimasel aastal",
 "years ago" => "aastat tagasi",
-"Choose" => "Vali",
-"Error loading file picker template: {error}" => "Viga failivalija malli laadimisel:  {error}",
 "Yes" => "Jah",
 "No" => "Ei",
+"Choose" => "Vali",
+"Error loading file picker template: {error}" => "Viga failivalija malli laadimisel:  {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Viga sõnumi malli laadimisel: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} failikonflikt","{count} failikonflikti"),
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Jaga kasutaja või grupiga ...",
 "Share link" => "Jaga linki",
 "Password protect" => "Parooliga kaitstud",
-"Password" => "Parool",
 "Allow Public Upload" => "Luba avalik üleslaadimine",
 "Email link to person" => "Saada link isikule e-postiga",
 "Send" => "Saada",
@@ -150,6 +149,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>",
+"Password" => "Parool",
 "Storage & database" => "Andmehoidla ja andmebaas",
 "Data folder" => "Andmete kaust",
 "Configure the database" => "Seadista andmebaasi",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 3b59fcdddb..0e9d4c5fe7 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Expiration date is in the past." => "Muga data iraganekoa da",
 "Couldn't send mail to following users: %s " => "Ezin izan da posta bidali hurrengo erabiltzaileei: %s",
 "Turned on maintenance mode" => "Mantenu modua gaitu da",
 "Turned off maintenance mode" => "Mantenu modua desgaitu da",
@@ -40,15 +41,16 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("orain dela hilabete %n","orain dela %n hilabete"),
 "last year" => "joan den urtean",
 "years ago" => "urte",
-"Choose" => "Aukeratu",
-"Error loading file picker template: {error}" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
 "Yes" => "Bai",
 "No" => "Ez",
+"Choose" => "Aukeratu",
+"Error loading file picker template: {error}" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
 "Ok" => "Ados",
 "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",
+"Already existing files" => "Dagoeneko existitzen diren fitxategiak",
 "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",
@@ -56,6 +58,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(denak hautatuta)",
 "({count} selected)" => "({count} hautatuta)",
 "Error loading file exists template" => "Errorea fitxategia existitzen da txantiloiak kargatzerakoan",
+"Very weak password" => "Pasahitz oso ahula",
+"Weak password" => "Pasahitz ahula",
+"So-so password" => "Halamoduzko pasahitza",
+"Good password" => "Pasahitz ona",
+"Strong password" => "Pasahitz sendoa",
 "Shared" => "Elkarbanatuta",
 "Share" => "Elkarbanatu",
 "Error" => "Errorea",
@@ -67,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Elkarbanatu erabiltzaile edo taldearekin...",
 "Share link" => "Elkarbanatu lotura",
 "Password protect" => "Babestu pasahitzarekin",
-"Password" => "Pasahitza",
 "Allow Public Upload" => "Gaitu igotze publikoa",
 "Email link to person" => "Postaz bidali lotura ",
 "Send" => "Bidali",
@@ -103,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>." => "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud komunitatearentzako</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
 "%s password reset" => "%s pasahitza berrezarri",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Arazo bat gertatu da posta elektronikoa bidaltzerakoan, mesedez jarri harremanetan zure administrariarekin.",
 "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora \nepe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan ipini.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Eskaerak huts egin du!<br>Ziur zaude posta/pasahitza zuzenak direla?",
@@ -115,6 +122,7 @@ $TRANSLATIONS = array(
 "To login page" => "Sarrera orrira",
 "New password" => "Pasahitz berria",
 "Reset password" => "Berrezarri pasahitza",
+"For the best results, please consider using a GNU/Linux server instead." => "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.",
 "Personal" => "Pertsonala",
 "Users" => "Erabiltzaileak",
 "Apps" => "Aplikazioak",
@@ -140,6 +148,8 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
 "Create an <strong>admin account</strong>" => "Sortu <strong>kudeatzaile kontu<strong> bat",
+"Password" => "Pasahitza",
+"Storage & database" => "Biltegia & datubasea",
 "Data folder" => "Datuen karpeta",
 "Configure the database" => "Konfiguratu datu basea",
 "will be used" => "erabiliko da",
@@ -162,6 +172,7 @@ $TRANSLATIONS = array(
 "remember" => "gogoratu",
 "Log in" => "Hasi saioa",
 "Alternative Logins" => "Beste erabiltzaile izenak",
+"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>" => "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s",
 "This ownCloud instance is currently in single user mode." => "ownCloud instantzia hau erabiltzaile bakar moduan dago.",
 "This means only administrators can use the instance." => "Honek administradoreak bakarrik erabili dezakeela esan nahi du.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Jarri harremanetan zure sistema administratzailearekin mezu hau irauten badu edo bat-batean agertu bada.",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index ee634f466c..28a53095ae 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown filetype" => "نوع فایل ناشناخته",
+"Invalid image" => "عکس نامعتبر",
 "Sunday" => "یکشنبه",
 "Monday" => "دوشنبه",
 "Tuesday" => "سه شنبه",
@@ -22,22 +24,27 @@ $TRANSLATIONS = array(
 "Settings" => "تنظیمات",
 "Saving..." => "در حال ذخیره سازی...",
 "seconds ago" => "ثانیه‌ها پیش",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n minute ago_::_%n minutes ago_" => array("%n دقیقه قبل"),
+"_%n hour ago_::_%n hours ago_" => array("%n ساعت قبل"),
 "today" => "امروز",
 "yesterday" => "دیروز",
-"_%n day ago_::_%n days ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array("%n روز قبل"),
 "last month" => "ماه قبل",
-"_%n month ago_::_%n months ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("%n ماه قبل"),
 "last year" => "سال قبل",
 "years ago" => "سال‌های قبل",
-"Choose" => "انتخاب کردن",
 "Yes" => "بله",
 "No" => "نه",
+"Choose" => "انتخاب کردن",
 "Ok" => "قبول",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "New Files" => "فایل های جدید",
 "Cancel" => "منصرف شدن",
+"Continue" => "ادامه",
+"Weak password" => "رمز عبور ضعیف",
+"So-so password" => "رمز عبور متوسط",
+"Good password" => "رمز عبور خوب",
+"Strong password" => "رمز عبور قوی",
 "Shared" => "اشتراک گذاشته شده",
 "Share" => "اشتراک‌گذاری",
 "Error" => "خطا",
@@ -48,7 +55,6 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "به اشتراک گذاشته شده با شما توسط { دارنده}",
 "Share link" => "اشتراک گذاشتن لینک",
 "Password protect" => "نگهداری کردن رمز عبور",
-"Password" => "گذرواژه",
 "Allow Public Upload" => "اجازه آپلود عمومی",
 "Email link to person" => "پیوند ایمیل برای شخص.",
 "Send" => "ارسال",
@@ -96,12 +102,15 @@ $TRANSLATIONS = array(
 "Help" => "راه‌نما",
 "Access forbidden" => "اجازه دسترسی به مناطق ممنوعه را ندارید",
 "Cloud not found" => "پیدا نشد",
+"Cheers!" => "سلامتی!",
 "Security Warning" => "اخطار امنیتی",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "هیچ مولد تصادفی امن در دسترس نیست، لطفا فرمت PHP OpenSSL را فعال نمایید.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "بدون وجود یک تولید کننده اعداد تصادفی امن ، یک مهاجم ممکن است این قابلیت را داشته باشد که پیشگویی کند پسوورد های راه انداز گرفته شده و کنترلی روی حساب کاربری شما داشته باشد .",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.",
 "Create an <strong>admin account</strong>" => "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
+"Password" => "گذرواژه",
+"Storage & database" => "انبارش و پایگاه داده",
 "Data folder" => "پوشه اطلاعاتی",
 "Configure the database" => "پایگاه داده برنامه ریزی شدند",
 "will be used" => "استفاده خواهد شد",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 9188469abc..25da5ef81d 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n kuukausi sitten","%n kuukautta sitten"),
 "last year" => "viime vuonna",
 "years ago" => "vuotta sitten",
-"Choose" => "Valitse",
-"Error loading file picker template: {error}" => "Virhe ladatessa tiedostopohjia: {error}",
 "Yes" => "Kyllä",
 "No" => "Ei",
+"Choose" => "Valitse",
+"Error loading file picker template: {error}" => "Virhe ladatessa tiedostopohjia: {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Virhe ladatessa viestipohjaa: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} tiedoston ristiriita","{count} tiedoston ristiriita"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Jaettu kanssasi käyttäjän {owner} toimesta",
 "Share with user or group …" => "Jaa käyttäjän tai ryhmän kanssa…",
 "Share link" => "Jaa linkki",
+"The public link will expire no later than {days} days after it is created" => "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
+"By default the public link will expire after {days} days" => "Oletuksena julkinen linkki vanhenee {days} päivässä",
 "Password protect" => "Suojaa salasanalla",
-"Password" => "Salasana",
+"Choose a password for the public link" => "Valitse salasana julkiselle linkille",
 "Allow Public Upload" => "Salli julkinen lähetys",
 "Email link to person" => "Lähetä linkki sähköpostitse",
 "Send" => "Lähetä",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
 "Create an <strong>admin account</strong>" => "Luo <strong>ylläpitäjän tunnus</strong>",
+"Password" => "Salasana",
 "Storage & database" => "Tallennus ja tietokanta",
 "Data folder" => "Datakansio",
 "Configure the database" => "Muokkaa tietokantaa",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 49be57abf3..1c4b3ea436 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("Il y a %n mois","Il y a %n mois"),
 "last year" => "l'année dernière",
 "years ago" => "il y a plusieurs années",
-"Choose" => "Choisir",
-"Error loading file picker template: {error}" => "Erreur de chargement du modèle de sélectionneur de fichiers : {error}",
 "Yes" => "Oui",
 "No" => "Non",
+"Choose" => "Choisir",
+"Error loading file picker template: {error}" => "Erreur de chargement du modèle de sélectionneur de fichiers : {error}",
 "Ok" => "Ok",
 "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"),
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Partager avec un utilisateur ou un groupe...",
 "Share link" => "Partager le lien",
 "Password protect" => "Protéger par un mot de passe",
-"Password" => "Mot de passe",
 "Allow Public Upload" => "Autoriser l'upload par les utilisateurs non enregistrés",
 "Email link to person" => "Envoyez le lien par email",
 "Send" => "Envoyer",
@@ -150,6 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Votre répertoire data est certainement accessible depuis l'internet car le fichier .htaccess ne semble pas fonctionner",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
 "Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>",
+"Password" => "Mot de passe",
 "Storage & database" => "Support de stockage & base de données",
 "Data folder" => "Répertoire des données",
 "Configure the database" => "Configurer la base de données",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 9509446ec7..88ba544b16 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("hai %n mes","hai %n meses"),
 "last year" => "último ano",
 "years ago" => "anos atrás",
-"Choose" => "Escoller",
-"Error loading file picker template: {error}" => "Produciuse un erro ao cargar o modelo do selector: {error}",
 "Yes" => "Si",
 "No" => "Non",
+"Choose" => "Escoller",
+"Error loading file picker template: {error}" => "Produciuse un erro ao cargar o modelo do selector: {error}",
 "Ok" => "Aceptar",
 "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"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Compartido con vostede por {owner}",
 "Share with user or group …" => "Compartir cun usuario ou grupo ...",
 "Share link" => "Ligazón para compartir",
+"The public link will expire no later than {days} days after it is created" => "A ligazón pública caducará, a máis tardar, {days} días após a súa creación",
+"By default the public link will expire after {days} days" => "De xeito predeterminado, a ligazón pública caduca aos {days} días",
 "Password protect" => "Protexido con contrasinais",
-"Password" => "Contrasinal",
+"Choose a password for the public link" => "Escolla un contrasinal para a ligazón pública",
 "Allow Public Upload" => "Permitir o envío público",
 "Email link to person" => "Enviar ligazón por correo",
 "Send" => "Enviar",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
+"Password" => "Contrasinal",
 "Storage & database" => "Almacenamento e base de datos",
 "Data folder" => "Cartafol de datos",
 "Configure the database" => "Configurar a base de datos",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index d629ac6621..5c7fbba0c4 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("לפני %n חודש","לפני %n חודשים"),
 "last year" => "שנה שעברה",
 "years ago" => "שנים",
-"Choose" => "בחירה",
 "Yes" => "כן",
 "No" => "לא",
+"Choose" => "בחירה",
 "Ok" => "בסדר",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "New Files" => "קבצים חדשים",
@@ -47,7 +47,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
 "Shared with you by {owner}" => "שותף אתך על ידי {owner}",
 "Password protect" => "הגנה בססמה",
-"Password" => "סיסמא",
 "Email link to person" => "שליחת קישור בדוא״ל למשתמש",
 "Send" => "שליחה",
 "Set expiration date" => "הגדרת תאריך תפוגה",
@@ -99,6 +98,7 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ללא מחולל מספרים אקראיים מאובטח תוקף יכול לנבא את מחרוזות איפוס הססמה ולהשתלט על החשבון שלך.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
 "Create an <strong>admin account</strong>" => "יצירת <strong>חשבון מנהל</strong>",
+"Password" => "סיסמא",
 "Data folder" => "תיקיית נתונים",
 "Configure the database" => "הגדרת מסד הנתונים",
 "will be used" => "ינוצלו",
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index 3fad334f70..1b15629168 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -27,7 +27,6 @@ $TRANSLATIONS = array(
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Share" => "साझा करें",
 "Error" => "त्रुटि",
-"Password" => "पासवर्ड",
 "Send" => "भेजें",
 "No people found" => "कोई व्यक्ति नहीं मिले ",
 "Sending ..." => "भेजा जा रहा है",
@@ -46,6 +45,7 @@ $TRANSLATIONS = array(
 "Cloud not found" => "क्लौड नहीं मिला ",
 "Security Warning" => "सुरक्षा चेतावनी ",
 "Create an <strong>admin account</strong>" => "व्यवस्थापक खाता बनाएँ",
+"Password" => "पासवर्ड",
 "Data folder" => "डाटा फोल्डर",
 "Configure the database" => "डेटाबेस कॉन्फ़िगर करें ",
 "will be used" => "उपयोग होगा",
diff --git a/core/l10n/hi_IN.php b/core/l10n/hi_IN.php
new file mode 100644
index 0000000000..ffcdde48d4
--- /dev/null
+++ b/core/l10n/hi_IN.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/hr.php b/core/l10n/hr.php
index 60b82a22ad..248a56e4fa 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "prošlu godinu",
 "years ago" => "godina",
-"Choose" => "Izaberi",
 "Yes" => "Da",
 "No" => "Ne",
+"Choose" => "Izaberi",
 "Ok" => "U redu",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
 "Cancel" => "Odustani",
@@ -43,7 +43,6 @@ $TRANSLATIONS = array(
 "Error while unsharing" => "Greška prilikom isključivanja djeljenja",
 "Error while changing permissions" => "Greška prilikom promjena prava",
 "Password protect" => "Zaštiti lozinkom",
-"Password" => "Lozinka",
 "Set expiration date" => "Postavi datum isteka",
 "Expiration date" => "Datum isteka",
 "Share via email:" => "Dijeli preko email-a:",
@@ -76,6 +75,7 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Pristup zabranjen",
 "Cloud not found" => "Cloud nije pronađen",
 "Create an <strong>admin account</strong>" => "Stvori <strong>administratorski račun</strong>",
+"Password" => "Lozinka",
 "Data folder" => "Mapa baze podataka",
 "Configure the database" => "Konfiguriraj bazu podataka",
 "will be used" => "će se koristiti",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 529eed687c..b1e8bf98e5 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Expiration date is in the past." => "Múltbéli lejárati idő.",
 "Couldn't send mail to following users: %s " => "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
 "Turned on maintenance mode" => "A karbantartási mód bekapcsolva",
 "Turned off maintenance mode" => "A karbantartási mód kikapcsolva",
@@ -40,22 +41,28 @@ $TRANSLATIONS = array(
 "_%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",
-"Choose" => "Válasszon",
-"Error loading file picker template: {error}" => "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
 "Yes" => "Igen",
 "No" => "Nem",
+"Choose" => "Válasszon",
+"Error loading file picker template: {error}" => "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
 "Ok" => "Ok",
 "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",
+"Already existing files" => "A fájlok már láteznek",
 "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",
 "Continue" => "Folytatás",
-"(all selected)" => "(all selected)",
-"({count} selected)" => "({count} kiválasztva)",
+"(all selected)" => "(az összes ki lett választva)",
+"({count} selected)" => "({count} lett kiválasztva)",
 "Error loading file exists template" => "Hiba a létező sablon betöltésekor",
+"Very weak password" => "Nagyon gyenge jelszó",
+"Weak password" => "Gyenge jelszó",
+"So-so password" => "Nem túl jó jelszó",
+"Good password" => "Jó jelszó",
+"Strong password" => "Erős jelszó",
 "Shared" => "Megosztott",
 "Share" => "Megosztás",
 "Error" => "Hiba",
@@ -67,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Megosztani egy felhasználóval vagy csoporttal ...",
 "Share link" => "Megosztás hivatkozással",
 "Password protect" => "Jelszóval is védem",
-"Password" => "Jelszó",
 "Allow Public Upload" => "Feltöltést is engedélyezek",
 "Email link to person" => "Email címre küldjük el",
 "Send" => "Küldjük el",
@@ -103,6 +109,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A frissítés nem sikerült. Kérem értesítse erről a problémáról az <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud közösséget</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
 "%s password reset" => "%s jelszó visszaállítás",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Hiba történt e-mail küldése közben. Érdemes az adminisztrátort értesíteni.",
 "Use the following link to reset your password: {link}" => "Használja ezt a linket a jelszó ismételt beállításához: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Emailben fog kapni egy linket, amivel új jelszót tud majd beállítani magának. <br>Ha a levél nem jött meg, holott úgy érzi, hogy már meg kellett volna érkeznie, akkor ellenőrizze a spam/levélszemét mappáját. <br>Ha ott sincsen, akkor érdeklődjön a rendszergazdánál.",
 "Request failed!<br>Did you make sure your email/username was right?" => "A kérést nem sikerült teljesíteni! <br>Biztos, hogy jó emailcímet/felhasználónevet adott meg?",
@@ -115,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "A bejelentkező ablakhoz",
 "New password" => "Az új jelszó",
 "Reset password" => "Jelszó-visszaállítás",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Felhasználás csak saját felelősségre!",
+"For the best results, please consider using a GNU/Linux server instead." => "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni.",
 "Personal" => "Személyes",
 "Users" => "Felhasználók",
 "Apps" => "Alkalmazások",
@@ -140,6 +149,8 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
 "Create an <strong>admin account</strong>" => "<strong>Rendszergazdai belépés</strong> létrehozása",
+"Password" => "Jelszó",
+"Storage & database" => "Tárolás & adatbázis",
 "Data folder" => "Adatkönyvtár",
 "Configure the database" => "Adatbázis konfigurálása",
 "will be used" => "adatbázist fogunk használni",
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index ef9c79a654..fcf64fa8f6 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -38,9 +38,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "ultime anno",
 "years ago" => "annos passate",
-"Choose" => "Seliger",
 "Yes" => "Si",
 "No" => "No",
+"Choose" => "Seliger",
 "Ok" => "Ok",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de file","{count} conflictos de file"),
 "One file conflict" => "Un conflicto de file",
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Compartir con usator o gruppo ...",
 "Share link" => "Compartir ligamine",
 "Password protect" => "Protegite per contrasigno",
-"Password" => "Contrasigno",
 "Allow Public Upload" => "Permitter incargamento public",
 "Email link to person" => "Ligamine de e-posta a persona",
 "Send" => "Invia",
@@ -123,6 +122,7 @@ $TRANSLATIONS = array(
 "Security Warning" => "Aviso de securitate",
 "Please update your PHP installation to use %s securely." => "Pro favor actualisa tu installation de PHP pro usar %s con securitate.",
 "Create an <strong>admin account</strong>" => "Crear un <strong>conto de administration</strong>",
+"Password" => "Contrasigno",
 "Storage & database" => "Immagazinage & base de datos",
 "Data folder" => "Dossier de datos",
 "Configure the database" => "Configurar le base de datos",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 8d18cc60a9..c8b7853365 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -40,14 +40,16 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n bulan yang lalu"),
 "last year" => "tahun kemarin",
 "years ago" => "beberapa tahun lalu",
-"Choose" => "Pilih",
-"Error loading file picker template: {error}" => "Galat memuat templat berkas pemilih: {error}",
 "Yes" => "Ya",
 "No" => "Tidak",
+"Choose" => "Pilih",
+"Error loading file picker template: {error}" => "Galat memuat templat berkas pemilih: {error}",
 "Ok" => "Oke",
 "Error loading message template: {error}" => "Galat memuat templat pesan: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} berkas konflik"),
 "One file conflict" => "Satu berkas konflik",
+"New Files" => "Berkas Baru",
+"Already existing files" => "Berkas sudah ada",
 "Which files do you want to keep?" => "Berkas mana yang ingin anda pertahankan?",
 "If you select both versions, the copied file will have a number added to its name." => "Jika anda memilih kedua versi, berkas yang disalin akan memiliki nomor yang ditambahkan sesuai namanya.",
 "Cancel" => "Batal",
@@ -55,6 +57,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(semua terpilih)",
 "({count} selected)" => "({count} terpilih)",
 "Error loading file exists template" => "Galat memuat templat berkas yang sudah ada",
+"Very weak password" => "Sandi sangat lemah",
+"Weak password" => "Sandi lemah",
+"So-so password" => "Sandi lumayan",
+"Good password" => "Sandi baik",
+"Strong password" => "Sandi kuat",
 "Shared" => "Dibagikan",
 "Share" => "Bagikan",
 "Error" => "Galat",
@@ -66,7 +73,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Bagikan dengan pengguna atau grup ...",
 "Share link" => "Bagikan tautan",
 "Password protect" => "Lindungi dengan sandi",
-"Password" => "Sandi",
 "Allow Public Upload" => "Izinkan Unggahan Publik",
 "Email link to person" => "Emailkan tautan ini ke orang",
 "Send" => "Kirim",
@@ -102,6 +108,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitas ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
 "%s password reset" => "%s sandi diatur ulang",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Terjadi masalah saat mengirim email, silakan hubungi administrator Anda.",
 "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {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 ." => "Tautan untuk mengatur ulang sandi anda telah dikirimkan ke email Anda.<br>Jika anda tidak menerimanya selama waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada juga, coba tanyakanlah kepada administrator lokal anda.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Permintaan gagal!<br>Apakah anda yakin email/nama pengguna anda benar?",
@@ -114,6 +121,8 @@ $TRANSLATIONS = array(
 "To login page" => "Ke halaman masuk",
 "New password" => "Sandi baru",
 "Reset password" => "Atur ulang sandi",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!",
+"For the best results, please consider using a GNU/Linux server instead." => "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ",
 "Personal" => "Pribadi",
 "Users" => "Pengguna",
 "Apps" => "Aplikasi",
@@ -139,6 +148,8 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
 "Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
+"Password" => "Sandi",
+"Storage & database" => "Penyimpanan & Basis data",
 "Data folder" => "Folder data",
 "Configure the database" => "Konfigurasikan basis data",
 "will be used" => "akan digunakan",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 254c4b3868..dcce228e24 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "síðasta ári",
 "years ago" => "einhverjum árum",
-"Choose" => "Veldu",
 "Yes" => "Já",
 "No" => "Nei",
+"Choose" => "Veldu",
 "Ok" => "Í lagi",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Hætta við",
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "Deilt með þér og hópnum {group} af {owner}",
 "Shared with you by {owner}" => "Deilt með þér af {owner}",
 "Password protect" => "Verja með lykilorði",
-"Password" => "Lykilorð",
 "Email link to person" => "Senda vefhlekk í tölvupóstu til notenda",
 "Send" => "Senda",
 "Set expiration date" => "Setja gildistíma",
@@ -90,6 +89,7 @@ $TRANSLATIONS = array(
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Enginn traustur slembitölugjafi í boði, vinsamlegast virkjaðu PHP OpenSSL viðbótina.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Án öruggs slembitölugjafa er mögulegt að sjá fyrir öryggis auðkenni til að endursetja lykilorð og komast inn á aðganginn þinn.",
 "Create an <strong>admin account</strong>" => "Útbúa <strong>vefstjóra aðgang</strong>",
+"Password" => "Lykilorð",
 "Data folder" => "Gagnamappa",
 "Configure the database" => "Stilla gagnagrunn",
 "will be used" => "verður notað",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index dfcc0a480a..2c420dff25 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n mese fa","%n mesi fa"),
 "last year" => "anno scorso",
 "years ago" => "anni fa",
-"Choose" => "Scegli",
-"Error loading file picker template: {error}" => "Errore durante il caricamento del modello del selettore file: {error}",
 "Yes" => "Sì",
 "No" => "No",
+"Choose" => "Scegli",
+"Error loading file picker template: {error}" => "Errore durante il caricamento del modello del selettore file: {error}",
 "Ok" => "Ok",
 "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"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Condiviso con te da {owner}",
 "Share with user or group …" => "Condividi con utente o gruppo ...",
 "Share link" => "Condividi collegamento",
+"The public link will expire no later than {days} days after it is created" => "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione",
+"By default the public link will expire after {days} days" => "In modo predefinito, il collegamento pubblico scadrà dopo {days} giorni",
 "Password protect" => "Proteggi con password",
-"Password" => "Password",
+"Choose a password for the public link" => "Scegli una password per il collegamento pubblico",
 "Allow Public Upload" => "Consenti caricamento pubblico",
 "Email link to person" => "Invia collegamento via email",
 "Send" => "Invia",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
 "Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
+"Password" => "Password",
 "Storage & database" => "Archiviazione e database",
 "Data folder" => "Cartella dati",
 "Configure the database" => "Configura il database",
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
index ea8b44ff60..51d0df65f3 100644
--- a/core/l10n/ja.php
+++ b/core/l10n/ja.php
@@ -41,15 +41,16 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%nヶ月前"),
 "last year" => "1年前",
 "years ago" => "数年前",
-"Choose" => "選択",
-"Error loading file picker template: {error}" => "ファイル選択テンプレートの読み込みエラー: {error}",
 "Yes" => "はい",
 "No" => "いいえ",
+"Choose" => "選択",
+"Error loading file picker template: {error}" => "ファイル選択テンプレートの読み込みエラー: {error}",
 "Ok" => "OK",
 "Error loading message template: {error}" => "メッセージテンプレートの読み込みエラー: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} ファイルが競合"),
 "One file conflict" => "1ファイルが競合",
 "New Files" => "新しいファイル",
+"Already existing 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" => "キャンセル",
@@ -73,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "ユーザーもしくはグループと共有 ...",
 "Share link" => "URLで共有",
 "Password protect" => "パスワード保護",
-"Password" => "パスワード",
 "Allow Public Upload" => "アップロードを許可",
 "Email link to person" => "メールリンク",
 "Send" => "送信",
@@ -149,6 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccess ファイルが動作していないため、おそらくあなたのデータディレクトリもしくはファイルはインターネットからアクセス可能です。",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。",
 "Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
+"Password" => "パスワード",
 "Storage & database" => "ストレージとデータベース",
 "Data folder" => "データフォルダー",
 "Configure the database" => "データベースを設定してください",
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 3389bafa7a..5d1d14ecb0 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array(""),
 "last year" => "ბოლო წელს",
 "years ago" => "წლის წინ",
-"Choose" => "არჩევა",
 "Yes" => "კი",
 "No" => "არა",
+"Choose" => "არჩევა",
 "Ok" => "დიახ",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "New Files" => "ახალი ფაილები",
@@ -47,7 +47,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
 "Shared with you by {owner}" => "გაზიარდა თქვენთვის {owner}–ის მიერ",
 "Password protect" => "პაროლით დაცვა",
-"Password" => "პაროლი",
 "Email link to person" => "ლინკის პიროვნების იმეილზე გაგზავნა",
 "Send" => "გაგზავნა",
 "Set expiration date" => "მიუთითე ვადის გასვლის დრო",
@@ -95,6 +94,7 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "შემთხვევითი სიმბოლოების გენერატორის გარეშე, შემტევმა შეიძლება ამოიცნოს თქვენი პაროლი შეგიცვალოთ ის და დაეუფლოს თქვენს ექაუნთს.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან  .htaccess ფაილი არ მუშაობს.",
 "Create an <strong>admin account</strong>" => "შექმენი <strong>ადმინ ექაუნტი</strong>",
+"Password" => "პაროლი",
 "Data folder" => "მონაცემთა საქაღალდე",
 "Configure the database" => "მონაცემთა ბაზის კონფიგურირება",
 "will be used" => "გამოყენებული იქნება",
diff --git a/core/l10n/km.php b/core/l10n/km.php
index 0eac818c57..0ba2e2f92c 100644
--- a/core/l10n/km.php
+++ b/core/l10n/km.php
@@ -33,12 +33,22 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n ខែ​មុន"),
 "last year" => "ឆ្នាំ​មុន",
 "years ago" => "ឆ្នាំ​មុន",
-"Choose" => "ជ្រើស",
 "Yes" => "ព្រម",
 "No" => "ទេ",
+"Choose" => "ជ្រើស",
 "Ok" => "ព្រម",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
+"New Files" => "ឯកសារ​ថ្មី",
+"Already existing files" => "មាន​ឯកសារ​នេះ​រួច​ហើយ",
 "Cancel" => "លើកលែង",
+"Continue" => "បន្ត",
+"(all selected)" => "(បាន​ជ្រើស​ទាំង​អស់)",
+"({count} selected)" => "(បាន​ជ្រើស {count})",
+"Very weak password" => "ពាក្យ​សម្ងាត់​ខ្សោយ​ណាស់",
+"Weak password" => "ពាក្យ​សម្ងាត់​ខ្សោយ",
+"So-so password" => "ពាក្យ​សម្ងាត់​ធម្មតា",
+"Good password" => "ពាក្យ​សម្ងាត់​ល្អ",
+"Strong password" => "ពាក្យ​សម្ងាត់​ខ្លាំង",
 "Shared" => "បាន​ចែក​រំលែក",
 "Share" => "ចែក​រំលែក",
 "Error" => "កំហុស",
@@ -48,7 +58,7 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}",
 "Shared with you by {owner}" => "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}",
 "Password protect" => "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
-"Password" => "ពាក្យសម្ងាត់",
+"Allow Public Upload" => "អនុញ្ញាត​ការ​ផ្ទុកឡើង​ជា​សាធារណៈ",
 "Send" => "ផ្ញើ",
 "Set expiration date" => "កំណត់​ពេល​ផុត​កំណត់",
 "Expiration date" => "ពេល​ផុត​កំណត់",
@@ -71,6 +81,8 @@ $TRANSLATIONS = array(
 "The object type is not specified." => "មិន​បាន​កំណត់​ប្រភេទ​វត្ថុ។",
 "Delete" => "លុប",
 "Add" => "បញ្ចូល",
+"Please reload the page." => "សូម​ផ្ទុក​ទំព័រ​នេះ​ឡើង​វិញ។",
+"A problem has occurred whilst sending the email, please contact your administrator." => "មាន​កំហុស​បាន​កើត​ឡើង​នៅ​ពេលល​កំពុង​ផ្ញើ​អ៊ីមែល​ចេញ, សូម​ទាក់ទង​អភិបាល​របស់​អ្នក។",
 "Username" => "ឈ្មោះ​អ្នកប្រើ",
 "Your password was reset" => "ពាក្យ​សម្ងាត់​របស់​អ្នក​ត្រូវ​បាន​កំណត់​ឡើង​វិញ",
 "To login page" => "ទៅ​ទំព័រ​ចូល",
@@ -83,6 +95,26 @@ $TRANSLATIONS = array(
 "Help" => "ជំនួយ",
 "Access forbidden" => "បាន​ហាមឃាត់​ការ​ចូល",
 "Cloud not found" => "រក​មិន​ឃើញ Cloud",
-"Security Warning" => "បម្រាម​សុវត្ថិភាព"
+"Security Warning" => "បម្រាម​សុវត្ថិភាព",
+"Create an <strong>admin account</strong>" => "បង្កើត​<strong>គណនី​អភិបាល</strong>",
+"Password" => "ពាក្យសម្ងាត់",
+"Storage & database" => "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្នន័យ",
+"Data folder" => "ថត​ទិន្នន័យ",
+"Configure the database" => "កំណត់​សណ្ឋាន​មូលដ្ឋាន​ទិន្នន័យ",
+"will be used" => "នឹង​ត្រូវ​បាន​ប្រើ",
+"Database user" => "អ្នក​ប្រើ​មូលដ្ឋាន​ទិន្នន័យ",
+"Database password" => "ពាក្យ​សម្ងាត់​មូលដ្ឋាន​ទិន្នន័យ",
+"Database name" => "ឈ្មោះ​មូលដ្ឋាន​ទិន្នន័យ",
+"Database host" => "ម៉ាស៊ីន​មូលដ្ឋាន​ទិន្នន័យ",
+"Finish setup" => "បញ្ចប់​ការ​ដំឡើង",
+"Finishing …" => "កំពុង​បញ្ចប់ ...",
+"Log out" => "ចាក​ចេញ",
+"Automatic logon rejected!" => "បាន​បដិសេធ​ការ​ចូល​ដោយ​ស្វ័យ​ប្រវត្តិ!",
+"Please change your password to secure your account again." => "សូម​ប្ដូរ​ពាក្យ​សម្ងាត់​របស់​អ្នក ដើម្បី​ការពារ​គណនី​របស់​អ្នក។",
+"Lost your password?" => "បាត់​ពាក្យ​សម្ងាត់​របស់​អ្នក?",
+"remember" => "ចងចាំ",
+"Log in" => "ចូល",
+"Alternative Logins" => "ការ​ចូល​ជំនួស",
+"Updating ownCloud to version %s, this may take a while." => "ការ​ធ្វើ​បច្ចុប្បន្នភាព ownCloud ទៅ​កំណែ %s អាច​ចំណាយ​ពេល​មួយ​សំទុះ។"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index d8c32e070d..bf509c31c4 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n달 전 "),
 "last year" => "작년",
 "years ago" => "년 전",
-"Choose" => "선택",
-"Error loading file picker template: {error}" => "파일 선택 템플릿을 불러오는 중 오류 발생: {error}",
 "Yes" => "예",
 "No" => "아니요",
+"Choose" => "선택",
+"Error loading file picker template: {error}" => "파일 선택 템플릿을 불러오는 중 오류 발생: {error}",
 "Ok" => "확인",
 "Error loading message template: {error}" => "메시지 템플릿을 불러오는 중 오류 발생: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("파일 {count}개 충돌"),
@@ -71,7 +71,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "사용자 및 그룹과 공유...",
 "Share link" => "링크 공유",
 "Password protect" => "암호 보호",
-"Password" => "암호",
 "Allow Public Upload" => "공개 업로드 허용",
 "Email link to person" => "이메일 주소",
 "Send" => "전송",
@@ -144,6 +143,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_blank\">문서</a>를 참조하십시오.",
 "Create an <strong>admin account</strong>" => "<strong>관리자 계정</strong> 만들기",
+"Password" => "암호",
 "Storage & database" => "스토리지 & 데이터베이스",
 "Data folder" => "데이터 폴더",
 "Configure the database" => "데이터베이스 설정",
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
index 781018d4ab..3aa234f1d5 100644
--- a/core/l10n/ku_IQ.php
+++ b/core/l10n/ku_IQ.php
@@ -12,7 +12,6 @@ $TRANSLATIONS = array(
 "Cancel" => "لابردن",
 "Share" => "هاوبەشی کردن",
 "Error" => "هه‌ڵه",
-"Password" => "وشەی تێپەربو",
 "Warning" => "ئاگاداری",
 "Add" => "زیادکردن",
 "Username" => "ناوی به‌کارهێنه‌ر",
@@ -23,6 +22,7 @@ $TRANSLATIONS = array(
 "Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی",
 "Help" => "یارمەتی",
 "Cloud not found" => "هیچ نه‌دۆزرایه‌وه‌",
+"Password" => "وشەی تێپەربو",
 "Data folder" => "زانیاری فۆڵده‌ر",
 "Database user" => "به‌كارهێنه‌ری داتابه‌یس",
 "Database password" => "وشه‌ی نهێنی داتا به‌یس",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 30337c5fc8..913a16d892 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -37,9 +37,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "Lescht Joer",
 "years ago" => "Joren hir",
-"Choose" => "Auswielen",
 "Yes" => "Jo",
 "No" => "Nee",
+"Choose" => "Auswielen",
 "Ok" => "OK",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Which files do you want to keep?" => "Weieng Fichieren wëlls de gär behalen?",
@@ -57,7 +57,6 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Gedeelt mat dir vum {owner}",
 "Share link" => "Link deelen",
 "Password protect" => "Passwuertgeschützt",
-"Password" => "Passwuert",
 "Allow Public Upload" => "Ëffentlechen Upload erlaaben",
 "Email link to person" => "Link enger Persoun mailen",
 "Send" => "Schécken",
@@ -119,6 +118,7 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ouni e sécheren Zoufallsgenerator kann en Ugräifer d'Passwuert-Zrécksetzungs-Schlësselen viraussoen an en Account iwwerhuelen.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
 "Create an <strong>admin account</strong>" => "En <strong>Admin-Account</strong> uleeën",
+"Password" => "Passwuert",
 "Data folder" => "Daten-Dossier",
 "Configure the database" => "D'Datebank konfiguréieren",
 "will be used" => "wärt benotzt ginn",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index e3b612df3f..15d09e9308 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "_%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",
-"Choose" => "Pasirinkite",
-"Error loading file picker template: {error}" => "Klaida įkeliant failo parinkimo ruošinį: {error}",
 "Yes" => "Taip",
 "No" => "Ne",
+"Choose" => "Pasirinkite",
+"Error loading file picker template: {error}" => "Klaida įkeliant failo parinkimo ruošinį: {error}",
 "Ok" => "Gerai",
 "Error loading message template: {error}" => "Klaida įkeliant žinutės ruošinį: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} failas konfliktuoja","{count} failai konfliktuoja","{count} failų konfliktų"),
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Dalintis su vartotoju arba grupe...",
 "Share link" => "Dalintis nuoroda",
 "Password protect" => "Apsaugotas slaptažodžiu",
-"Password" => "Slaptažodis",
 "Allow Public Upload" => "Leisti viešą įkėlimą",
 "Email link to person" => "Nusiųsti nuorodą paštu",
 "Send" => "Siųsti",
@@ -139,6 +138,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
 "Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrą</strong>",
+"Password" => "Slaptažodis",
 "Data folder" => "Duomenų katalogas",
 "Configure the database" => "Nustatyti duomenų bazę",
 "will be used" => "bus naudojama",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 37cde915c5..e0e59e7eae 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("Šomēnes, %n mēneši","Pirms %n mēneša","Pirms %n mēnešiem"),
 "last year" => "gājušajā gadā",
 "years ago" => "gadus atpakaļ",
-"Choose" => "Izvēlieties",
 "Yes" => "Jā",
 "No" => "Nē",
+"Choose" => "Izvēlieties",
 "Ok" => "Labi",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
 "New Files" => "Jaunās datnes",
@@ -47,7 +47,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "{owner} dalījās ar jums un grupu {group}",
 "Shared with you by {owner}" => "{owner} dalījās ar jums",
 "Password protect" => "Aizsargāt ar paroli",
-"Password" => "Parole",
 "Allow Public Upload" => "Ļaut publisko augšupielādi.",
 "Email link to person" => "Sūtīt saiti personai pa e-pastu",
 "Send" => "Sūtīt",
@@ -103,6 +102,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
 "Create an <strong>admin account</strong>" => "Izveidot <strong>administratora kontu</strong>",
+"Password" => "Parole",
 "Data folder" => "Datu mape",
 "Configure the database" => "Konfigurēt datubāzi",
 "will be used" => "tiks izmantots",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 64c6671abf..e27f5a6af6 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -37,9 +37,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "минатата година",
 "years ago" => "пред години",
-"Choose" => "Избери",
 "Yes" => "Да",
 "No" => "Не",
+"Choose" => "Избери",
 "Ok" => "Во ред",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "One file conflict" => "Конфликт со една датотека",
@@ -58,7 +58,6 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Споделено со Вас од {owner}",
 "Share link" => "Сподели ја врската",
 "Password protect" => "Заштити со лозинка",
-"Password" => "Лозинка",
 "Allow Public Upload" => "Дозволи јавен аплоуд",
 "Email link to person" => "Прати врска по е-пошта на личност",
 "Send" => "Прати",
@@ -121,6 +120,7 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без сигурен генератор на случајни броеви напаѓач може да ги предвиди жетоните за ресетирање на лозинка и да преземе контрола врз Вашата сметка. ",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.",
 "Create an <strong>admin account</strong>" => "Направете <strong>администраторска сметка</strong>",
+"Password" => "Лозинка",
 "Data folder" => "Фолдер со податоци",
 "Configure the database" => "Конфигурирај ја базата",
 "will be used" => "ќе биде користено",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 63355191b6..b32888238c 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -32,7 +32,6 @@ $TRANSLATIONS = array(
 "Cancel" => "Batal",
 "Share" => "Kongsi",
 "Error" => "Ralat",
-"Password" => "Kata laluan",
 "Warning" => "Amaran",
 "Delete" => "Padam",
 "Add" => "Tambah",
@@ -52,6 +51,7 @@ $TRANSLATIONS = array(
 "Cloud not found" => "Awan tidak dijumpai",
 "Security Warning" => "Amaran keselamatan",
 "Create an <strong>admin account</strong>" => "buat <strong>akaun admin</strong>",
+"Password" => "Kata laluan",
 "Data folder" => "Fail data",
 "Configure the database" => "Konfigurasi pangkalan data",
 "will be used" => "akan digunakan",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index 4ccf19b186..4d722a859f 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -22,13 +22,12 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array(""),
 "last year" => "မနှစ်က",
 "years ago" => "နှစ် အရင်က",
-"Choose" => "ရွေးချယ်",
 "Yes" => "ဟုတ်",
 "No" => "မဟုတ်ဘူး",
+"Choose" => "ရွေးချယ်",
 "Ok" => "အိုကေ",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "Cancel" => "ပယ်ဖျက်မည်",
-"Password" => "စကားဝှက်",
 "Set expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
 "Expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်",
 "Share via email:" => "အီးမေးလ်ဖြင့်ဝေမျှမည် -",
@@ -51,6 +50,7 @@ $TRANSLATIONS = array(
 "Cloud not found" => "မတွေ့ရှိမိပါ",
 "Security Warning" => "လုံခြုံရေးသတိပေးချက်",
 "Create an <strong>admin account</strong>" => "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
+"Password" => "စကားဝှက်",
 "Data folder" => "အချက်အလက်ဖိုလ်ဒါလ်",
 "Database user" => "Database သုံးစွဲသူ",
 "Database password" => "Database စကားဝှက်",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 2a9873f481..c832544d15 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n dag siden","%n dager siden"),
 "last year" => "i fjor",
 "years ago" => "år siden",
-"Choose" => "Velg",
-"Error loading file picker template: {error}" => "Feil ved lasting av filvelger-mal: {error}",
 "Yes" => "Ja",
 "No" => "Nei",
+"Choose" => "Velg",
+"Error loading file picker template: {error}" => "Feil ved lasting av filvelger-mal: {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Feil ved lasting av meldingsmal: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Del med bruker eller gruppe …",
 "Share link" => "Del lenke",
 "Password protect" => "Passordbeskyttet",
-"Password" => "Passord",
 "Allow Public Upload" => "Tillat Offentlig Opplasting",
 "Email link to person" => "Email lenke til person",
 "Send" => "Send",
@@ -143,6 +142,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>",
+"Password" => "Passord",
 "Storage & database" => "Lagring og database",
 "Data folder" => "Datamappe",
 "Configure the database" => "Konfigurer databasen",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 43748352a7..595266f6f4 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","%n maanden geleden"),
 "last year" => "vorig jaar",
 "years ago" => "jaar geleden",
-"Choose" => "Kies",
-"Error loading file picker template: {error}" => "Fout bij laden bestandenselecteur sjabloon: {error}",
 "Yes" => "Ja",
 "No" => "Nee",
+"Choose" => "Kies",
+"Error loading file picker template: {error}" => "Fout bij laden bestandenselecteur sjabloon: {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Fout bij laden berichtensjabloon: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} bestandsconflict","{count} bestandsconflicten"),
@@ -73,8 +73,9 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Gedeeld met u door {owner}",
 "Share with user or group …" => "Delen met gebruiker of groep ...",
 "Share link" => "Deel link",
+"The public link will expire no later than {days} days after it is created" => "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken",
+"By default the public link will expire after {days} days" => "Standaard vervalt een openbare link na {days} dagen",
 "Password protect" => "Wachtwoord beveiligd",
-"Password" => "Wachtwoord",
 "Allow Public Upload" => "Sta publieke uploads toe",
 "Email link to person" => "E-mail link naar persoon",
 "Send" => "Versturen",
@@ -94,7 +95,7 @@ $TRANSLATIONS = array(
 "delete" => "verwijderen",
 "share" => "deel",
 "Password protected" => "Wachtwoord beveiligd",
-"Error unsetting expiration date" => "Fout tijdens het verwijderen van de verval datum",
+"Error unsetting expiration date" => "Fout tijdens het verwijderen van de vervaldatum",
 "Error setting expiration date" => "Fout tijdens het instellen van de vervaldatum",
 "Sending ..." => "Versturen ...",
 "Email sent" => "E-mail verzonden",
@@ -107,19 +108,19 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Fout bij laden dialoog sjabloon: {error}",
 "No tags selected for deletion." => "Geen tags geselecteerd voor verwijdering.",
 "Please reload the page." => "Herlaad deze pagina.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
-"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud.",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
 "%s password reset" => "%s wachtwoord reset",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Er ontstond een probleem bij het versturen van het e-mailbericht, neem contact op met uw beheerder.",
-"Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De link voor het resetten van je wachtwoord is verzonden naar je e-mailadres.<br>Als je dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan je beheerder om te helpen.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoord goed waren?",
-"You will receive a link to reset your password via Email." => "Je ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail.",
+"Use the following link to reset your password: {link}" => "Gebruik de volgende link om uw wachtwoord te resetten: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De link voor het resetten van uw wachtwoord is verzonden naar uw e-mailadres.<br>Als u dat bericht niet snel ontvangen hebt, controleer dan uw spammap.<br>Als het daar ook niet is, vraag dan uw beheerder om hulp.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet u zeker dat uw gebruikersnaam en/of wachtwoord goed waren?",
+"You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
 "Username" => "Gebruikersnaam",
-"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?" => "Je bestanden zijn versleuteld. Als je geen recoverykey hebt ingeschakeld is er geen manier om je data terug te krijgen indien je je wachtwoord reset!\nAls je niet weet wat te doen, neem dan alsjeblieft contact op met je administrator eer je doorgaat.\nWil je echt doorgaan?",
+"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?" => "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?",
 "Yes, I really want to reset my password now" => "Ja, ik wil mijn wachtwoord nu echt resetten",
 "Reset" => "Reset",
-"Your password was reset" => "Je wachtwoord is gewijzigd",
+"Your password was reset" => "Uw wachtwoord is gewijzigd",
 "To login page" => "Naar de login-pagina",
 "New password" => "Nieuw wachtwoord",
 "Reset password" => "Reset wachtwoord",
@@ -139,17 +140,18 @@ $TRANSLATIONS = array(
 "Error unfavoriting" => "Fout bij verwijderen favorietstatus",
 "Access forbidden" => "Toegang verboden",
 "Cloud not found" => "Cloud niet gevonden",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo daar,\n\neven een berichtje dat %s %s met u deelde.\nBekijk het: %s\n\n",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\n%s deelt %s met u.\nBekijk het: %s\n\n",
 "The share will expire on %s." => "De share vervalt op %s.",
 "Cheers!" => "Proficiat!",
 "Security Warning" => "Beveiligingswaarschuwing",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uw PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Werk uw PHP installatie bij om %s veilig te kunnen gebruiken.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL-extentie aan.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Zonder random nummer generator is het mogelijk voor een aanvaller om de resettokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet werkt.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
 "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
+"Password" => "Wachtwoord",
 "Storage & database" => "Opslag & database",
 "Data folder" => "Gegevensmap",
 "Configure the database" => "Configureer de database",
@@ -161,19 +163,19 @@ $TRANSLATIONS = array(
 "Database host" => "Databaseserver",
 "Finish setup" => "Installatie afronden",
 "Finishing …" => "Afronden ...",
-"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." => "Deze applicatie heeft een werkend JavaScript nodig.  <a href=\"http://enable-javascript.com/\" target=\"_blank\">activeer JavaScript</a> en herlaad deze interface.",
+"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." => "Deze applicatie heeft JavaScript nodig om correct te functioneren.  <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeer JavaScript</a> en herlaad deze interface.",
 "%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
 "Log out" => "Afmelden",
 "Automatic logon rejected!" => "Automatische aanmelding geweigerd!",
-"If you did not change your password recently, your account may be compromised!" => "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overgenomen zijn!",
-"Please change your password to secure your account again." => "Wijzig je wachtwoord zodat je account weer beveiligd is.",
+"If you did not change your password recently, your account may be compromised!" => "Als u uw wachtwoord niet onlangs heeft aangepast, kan uw account overgenomen zijn!",
+"Please change your password to secure your account again." => "Wijzig uw wachtwoord zodat uw account weer beveiligd is.",
 "Server side authentication failed!" => "Authenticatie bij de server mislukte!",
 "Please contact your administrator." => "Neem contact op met uw systeembeheerder.",
 "Lost your password?" => "Wachtwoord vergeten?",
 "remember" => "onthoud gegevens",
-"Log in" => "Meld je aan",
+"Log in" => "Meld u aan",
 "Alternative Logins" => "Alternatieve inlogs",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo daar,<br><br>we willen even laten weten dat %s <strong>%s</strong> met u heeft gedeeld.<br><a href=\"%s\">Bekijk het!</a><br><br>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk het!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Deze ownCloud werkt momenteel in enkele gebruiker modus.",
 "This means only administrators can use the instance." => "Dat betekent dat alleen beheerders deze installatie kunnen gebruiken.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Beem contact op met uw systeembeheerder als deze melding aanhoudt of plotseling verscheen.",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 8d7e3c3788..a0b9b88729 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Couldn't send mail to following users: %s " => "Kunne ikkje snede e-post til følgande brukarar: %s ",
 "Turned on maintenance mode" => "Skrudde på vedlikehaldsmodus",
 "Turned off maintenance mode" => "Skrudde av vedlikehaldsmodus",
 "Updated database" => "Database oppdatert",
@@ -39,10 +40,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n månad sidan","%n månadar sidan"),
 "last year" => "i fjor",
 "years ago" => "år sidan",
-"Choose" => "Vel",
-"Error loading file picker template: {error}" => "Klarte ikkje å lasta filplukkarmal: {error}",
 "Yes" => "Ja",
 "No" => "Nei",
+"Choose" => "Vel",
+"Error loading file picker template: {error}" => "Klarte ikkje å lasta filplukkarmal: {error}",
 "Ok" => "Greitt",
 "Error loading message template: {error}" => "Klarte ikkje å lasta meldingsmal: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonfliktar"),
@@ -63,7 +64,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "Delt med deg og gruppa {group} av {owner}",
 "Shared with you by {owner}" => "Delt med deg av {owner}",
 "Password protect" => "Passordvern",
-"Password" => "Passord",
 "Allow Public Upload" => "Tillat offentleg opplasting",
 "Email link to person" => "Send lenkja over e-post",
 "Send" => "Send",
@@ -119,6 +119,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
 "Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
+"Password" => "Passord",
 "Data folder" => "Datamappe",
 "Configure the database" => "Set opp databasen",
 "will be used" => "vil verta nytta",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index b13275822b..f4dc0a0126 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "an passat",
 "years ago" => "ans a",
-"Choose" => "Causís",
 "Yes" => "Òc",
 "No" => "Non",
+"Choose" => "Causís",
 "Ok" => "D'accòrdi",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Annula",
@@ -43,7 +43,6 @@ $TRANSLATIONS = array(
 "Error while unsharing" => "Error al non partejar",
 "Error while changing permissions" => "Error al cambiar permissions",
 "Password protect" => "Parat per senhal",
-"Password" => "Senhal",
 "Set expiration date" => "Met la data d'expiracion",
 "Expiration date" => "Data d'expiracion",
 "Share via email:" => "Parteja tras corrièl :",
@@ -78,6 +77,7 @@ $TRANSLATIONS = array(
 "Cloud not found" => "Nívol pas trobada",
 "Security Warning" => "Avertiment de securitat",
 "Create an <strong>admin account</strong>" => "Crea un <strong>compte admin</strong>",
+"Password" => "Senhal",
 "Data folder" => "Dorsièr de donadas",
 "Configure the database" => "Configura la basa de donadas",
 "will be used" => "serà utilizat",
diff --git a/core/l10n/pa.php b/core/l10n/pa.php
index 021452d0b3..5144e96788 100644
--- a/core/l10n/pa.php
+++ b/core/l10n/pa.php
@@ -31,19 +31,19 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "ਪਿਛਲੇ ਸਾਲ",
 "years ago" => "ਸਾਲਾਂ ਪਹਿਲਾਂ",
-"Choose" => "ਚੁਣੋ",
 "Yes" => "ਹਾਂ",
 "No" => "ਨਹੀਂ",
+"Choose" => "ਚੁਣੋ",
 "Ok" => "ਠੀਕ ਹੈ",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "ਰੱਦ ਕਰੋ",
 "Share" => "ਸਾਂਝਾ ਕਰੋ",
 "Error" => "ਗਲ",
-"Password" => "ਪਾਸਵਰ",
 "Send" => "ਭੇਜੋ",
 "Warning" => "ਚੇਤਾਵਨੀ",
 "Delete" => "ਹਟਾਓ",
 "Username" => "ਯੂਜ਼ਰ-ਨਾਂ",
-"Security Warning" => "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ"
+"Security Warning" => "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
+"Password" => "ਪਾਸਵਰ"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 0e9860b4bf..138b96eb3f 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%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",
-"Choose" => "Wybierz",
-"Error loading file picker template: {error}" => "Błąd podczas ładowania pliku wybranego szablonu: {error}",
 "Yes" => "Tak",
 "No" => "Nie",
+"Choose" => "Wybierz",
+"Error loading file picker template: {error}" => "Błąd podczas ładowania pliku wybranego szablonu: {error}",
 "Ok" => "OK",
 "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"),
@@ -73,8 +73,9 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Udostępnione tobie przez {owner}",
 "Share with user or group …" => "Współdziel z użytkownikiem lub grupą ...",
 "Share link" => "Udostępnij link",
+"The public link will expire no later than {days} days after it is created" => "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia",
+"By default the public link will expire after {days} days" => "Domyślnie link publiczny wygaśnie po {days} dniach",
 "Password protect" => "Zabezpiecz hasłem",
-"Password" => "Hasło",
 "Allow Public Upload" => "Pozwól na  publiczne wczytywanie",
 "Email link to person" => "Wyślij osobie odnośnik poprzez e-mail",
 "Send" => "Wyślij",
@@ -150,6 +151,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
 "Create an <strong>admin account</strong>" => "Utwórz <strong>konta administratora</strong>",
+"Password" => "Hasło",
 "Storage & database" => "Zasoby dysku & baza danych",
 "Data folder" => "Katalog danych",
 "Configure the database" => "Skonfiguruj bazę danych",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index a7b671b440..d6b802dacf 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("ha %n mês","ha %n meses"),
 "last year" => "último ano",
 "years ago" => "anos atrás",
-"Choose" => "Escolha",
-"Error loading file picker template: {error}" => "Erro no seletor de carregamento modelo de arquivos: {error}",
 "Yes" => "Sim",
 "No" => "Não",
+"Choose" => "Escolha",
+"Error loading file picker template: {error}" => "Erro no seletor de carregamento modelo de arquivos: {error}",
 "Ok" => "Ok",
 "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"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Compartilhado com você por {owner}",
 "Share with user or group …" => "Compartilhar com usuário ou grupo ...",
 "Share link" => "Compartilher link",
+"The public link will expire no later than {days} days after it is created" => "O link público irá expirar não antes de {days} depois de ser criado",
+"By default the public link will expire after {days} days" => "Por padrão o link público irá expirar após {days} dias",
 "Password protect" => "Proteger com senha",
-"Password" => "Senha",
+"Choose a password for the public link" => "Escolha uma senha para o link público",
 "Allow Public Upload" => "Permitir upload público",
 "Email link to person" => "Enviar link por e-mail",
 "Send" => "Enviar",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta de administrador</strong>",
+"Password" => "Senha",
 "Storage & database" => "Armazenamento & banco de dados",
 "Data folder" => "Pasta de dados",
 "Configure the database" => "Configurar o banco de dados",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 9015dfd22b..19842d6e6e 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Expiration date is in the past." => "A data de expiração é no passado.",
 "Couldn't send mail to following users: %s " => "Não conseguiu enviar correio aos seguintes utilizadores: %s",
 "Turned on maintenance mode" => "Activado o modo de manutenção",
 "Turned off maintenance mode" => "Desactivado o modo de manutenção",
@@ -40,15 +41,16 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n mês atrás","%n meses atrás"),
 "last year" => "ano passado",
 "years ago" => "anos atrás",
-"Choose" => "Escolha",
-"Error loading file picker template: {error}" => "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
 "Yes" => "Sim",
 "No" => "Não",
+"Choose" => "Escolha",
+"Error loading file picker template: {error}" => "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
 "Ok" => "Ok",
 "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",
+"Already existing files" => "Ficheiro já existente",
 "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",
@@ -56,6 +58,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(todos seleccionados)",
 "({count} selected)" => "({count} seleccionados)",
 "Error loading file exists template" => "Erro ao carregar o modelo de existências do ficheiro",
+"Very weak password" => "Password muito fraca",
+"Weak password" => "Password fraca",
+"So-so password" => "Password aceitável",
+"Good password" => "Password Forte",
+"Strong password" => "Password muito forte",
 "Shared" => "Partilhado",
 "Share" => "Partilhar",
 "Error" => "Erro",
@@ -67,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Partilhar com utilizador ou grupo...",
 "Share link" => "Partilhar o link",
 "Password protect" => "Proteger com palavra-passe",
-"Password" => "Password",
 "Allow Public Upload" => "Permitir Envios Públicos",
 "Email link to person" => "Enviar o link por e-mail",
 "Send" => "Enviar",
@@ -103,6 +109,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualização falhou. Por favor reporte este incidente seguindo este link <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
 "%s password reset" => "%s reposição da password",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador.",
 "Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
 "Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username correcto?",
@@ -115,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "Para a página de entrada",
 "New password" => "Nova palavra-chave",
 "Reset password" => "Repor password",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.",
+"For the best results, please consider using a GNU/Linux server instead." => "Para um melhor resultado, utilize antes o servidor GNU/Linux.",
 "Personal" => "Pessoal",
 "Users" => "Utilizadores",
 "Apps" => "Aplicações",
@@ -140,6 +149,8 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta administrativa</strong>",
+"Password" => "Password",
+"Storage & database" => "Armazenamento e base de dados",
 "Data folder" => "Pasta de dados",
 "Configure the database" => "Configure a base de dados",
 "will be used" => "vai ser usada",
@@ -162,6 +173,7 @@ $TRANSLATIONS = array(
 "remember" => "lembrar",
 "Log in" => "Entrar",
 "Alternative Logins" => "Contas de acesso alternativas",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Olá,<br><br>apenas para informar que %s partilhou <strong>%s</strong> consigo.<br><a href=\"%s\">Consulte aqui!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.",
 "This means only administrators can use the instance." => "Isto significa que apenas os administradores podem usar a instância.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte o seu administrador de sistema se esta mensagem continuar a aparecer ou apareceu inesperadamente.",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 648e8ba3ea..cb62d71ee1 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "ultimul an",
 "years ago" => "ani în urmă",
-"Choose" => "Alege",
 "Yes" => "Da",
 "No" => "Nu",
+"Choose" => "Alege",
 "Ok" => "Ok",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
 "One file conflict" => "Un conflict de fișier",
@@ -55,7 +55,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "Distribuie cu tine si grupul {group} de {owner}",
 "Shared with you by {owner}" => "Distribuie cu tine de {owner}",
 "Password protect" => "Protejare cu parolă",
-"Password" => "Parolă",
 "Allow Public Upload" => "Permiteţi încărcarea publică.",
 "Email link to person" => "Expediază legătura prin poșta electronică",
 "Send" => "Expediază",
@@ -110,6 +109,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.",
 "Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
+"Password" => "Parolă",
 "Data folder" => "Director date",
 "Configure the database" => "Configurează baza de date",
 "will be used" => "vor fi folosite",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index a09178a6cd..09757f41a1 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n месяц назад","%n месяца назад","%n месяцев назад"),
 "last year" => "в прошлом году",
 "years ago" => "несколько лет назад",
-"Choose" => "Выбрать",
-"Error loading file picker template: {error}" => "Ошибка при загрузке шаблона выбора файлов: {error}",
 "Yes" => "Да",
 "No" => "Нет",
+"Choose" => "Выбрать",
+"Error loading file picker template: {error}" => "Ошибка при загрузке шаблона выбора файлов: {error}",
 "Ok" => "Ок",
 "Error loading message template: {error}" => "Ошибка загрузки шаблона сообщений: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах"),
@@ -73,7 +73,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Поделиться с пользователем или группой...",
 "Share link" => "Поделиться ссылкой",
 "Password protect" => "Защитить паролем",
-"Password" => "Пароль",
 "Allow Public Upload" => "Разрешить открытую загрузку",
 "Email link to person" => "Почтовая ссылка на персону",
 "Send" => "Отправить",
@@ -149,6 +148,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>",
+"Password" => "Пароль",
 "Storage & database" => "Система хранения данных & база данных",
 "Data folder" => "Директория с данными",
 "Configure the database" => "Настройка базы данных",
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index bb125cc6af..1ce41214e9 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -31,16 +31,15 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "පෙර අවුරුද්දේ",
 "years ago" => "අවුරුදු කීපයකට පෙර",
-"Choose" => "තෝරන්න",
 "Yes" => "ඔව්",
 "No" => "එපා",
+"Choose" => "තෝරන්න",
 "Ok" => "හරි",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "එපා",
 "Share" => "බෙදා හදා ගන්න",
 "Error" => "දෝෂයක්",
 "Password protect" => "මුර පදයකින් ආරක්ශාකරන්න",
-"Password" => "මුර පදය",
 "Set expiration date" => "කල් ඉකුත් විමේ දිනය දමන්න",
 "Expiration date" => "කල් ඉකුත් විමේ දිනය",
 "Share via email:" => "විද්‍යුත් තැපෑල මඟින් බෙදාගන්න: ",
@@ -73,6 +72,7 @@ $TRANSLATIONS = array(
 "Cloud not found" => "සොයා ගත නොහැක",
 "Security Warning" => "ආරක්ෂක නිවේදනයක්",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ආරක්ෂිත අහඹු සංඛ්‍යා උත්පාදකයක් නොමැති නම් ඔබගේ ගිණුමට පහරදෙන අයකුට එහි මුරපද යළි පිහිටුවීමට අවශ්‍ය ටෝකන පහසුවෙන් සොයාගෙන ඔබගේ ගිණුම පැහැරගත හැක.",
+"Password" => "මුර පදය",
 "Data folder" => "දත්ත ෆෝල්ඩරය",
 "Configure the database" => "දත්ත සමුදාය හැඩගැසීම",
 "will be used" => "භාවිතා වනු ඇත",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 80d816a461..40a3aad7ac 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("pred %n mesiacom","pred %n mesiacmi","pred %n mesiacmi"),
 "last year" => "minulý rok",
 "years ago" => "pred rokmi",
-"Choose" => "Vybrať",
-"Error loading file picker template: {error}" => "Chyba pri nahrávaní šablóny výberu súborov: {error}",
 "Yes" => "Áno",
 "No" => "Nie",
+"Choose" => "Vybrať",
+"Error loading file picker template: {error}" => "Chyba pri nahrávaní šablóny výberu súborov: {error}",
 "Ok" => "Ok",
 "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"),
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Zdieľať s používateľom alebo skupinou ...",
 "Share link" => "Zdieľať linku",
 "Password protect" => "Chrániť heslom",
-"Password" => "Heslo",
 "Allow Public Upload" => "Povoliť verejné nahrávanie",
 "Email link to person" => "Odoslať odkaz emailom",
 "Send" => "Odoslať",
@@ -150,6 +149,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>",
+"Password" => "Heslo",
 "Storage & database" => "Úložislo & databáza",
 "Data folder" => "Priečinok dát",
 "Configure the database" => "Nastaviť databázu",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index c87a8d8d8f..f7a634df07 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%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",
-"Choose" => "Izbor",
-"Error loading file picker template: {error}" => "Napaka nalaganja predloge izbirnika datotek: {error}",
 "Yes" => "Da",
 "No" => "Ne",
+"Choose" => "Izbor",
+"Error loading file picker template: {error}" => "Napaka nalaganja predloge izbirnika datotek: {error}",
 "Ok" => "V redu",
 "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"),
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Souporaba z uporabnikom ali skupino ...",
 "Share link" => "Povezava za prejem",
 "Password protect" => "Zaščiti z geslom",
-"Password" => "Geslo",
 "Allow Public Upload" => "Dovoli javno pošiljanje na strežnik",
 "Email link to person" => "Posreduj povezavo po elektronski pošti",
 "Send" => "Pošlji",
@@ -150,6 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
 "Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniški račun</strong>",
+"Password" => "Geslo",
 "Storage & database" => "Shramba in podatkovna zbirka",
 "Data folder" => "Podatkovna mapa",
 "Configure the database" => "Nastavi podatkovno zbirko",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index b3221dc75f..efe07d0791 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n muaj më parë","%n muaj më parë"),
 "last year" => "vitin e shkuar",
 "years ago" => "vite më parë",
-"Choose" => "Zgjidh",
 "Yes" => "Po",
 "No" => "Jo",
+"Choose" => "Zgjidh",
 "Ok" => "Në rregull",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Anulo",
@@ -49,7 +49,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "Ndarë me ju dhe me grupin {group} nga {owner}",
 "Shared with you by {owner}" => "Ndarë me ju nga {owner}",
 "Password protect" => "Mbro me kod",
-"Password" => "Kodi",
 "Allow Public Upload" => "Lejo Ngarkimin Publik",
 "Email link to person" => "Dërgo email me lidhjen",
 "Send" => "Dërgo",
@@ -104,6 +103,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
 "Create an <strong>admin account</strong>" => "Krijo një <strong>llogari administruesi</strong>",
+"Password" => "Kodi",
 "Data folder" => "Emri i dosjes",
 "Configure the database" => "Konfiguro database-in",
 "will be used" => "do të përdoret",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 388ebb0df9..a597d67198 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "прошле године",
 "years ago" => "година раније",
-"Choose" => "Одабери",
 "Yes" => "Да",
 "No" => "Не",
+"Choose" => "Одабери",
 "Ok" => "У реду",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
 "Cancel" => "Откажи",
@@ -45,7 +45,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "Дељено са вама и са групом {group}. Поделио {owner}.",
 "Shared with you by {owner}" => "Поделио са вама {owner}",
 "Password protect" => "Заштићено лозинком",
-"Password" => "Лозинка",
 "Send" => "Пошаљи",
 "Set expiration date" => "Постави датум истека",
 "Expiration date" => "Датум истека",
@@ -88,6 +87,7 @@ $TRANSLATIONS = array(
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Поуздан генератор случајних бројева није доступан, предлажемо да укључите PHP проширење OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без поузданог генератора случајнох бројева нападач лако може предвидети лозинку за поништавање кључа шифровања и отети вам налог.",
 "Create an <strong>admin account</strong>" => "Направи <strong>административни налог</strong>",
+"Password" => "Лозинка",
 "Data folder" => "Фацикла података",
 "Configure the database" => "Подешавање базе",
 "will be used" => "ће бити коришћен",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index e7783b3c02..9b10179b72 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -30,9 +30,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "prošle godine",
 "years ago" => "pre nekoliko godina",
-"Choose" => "Izaberi",
 "Yes" => "Da",
 "No" => "Ne",
+"Choose" => "Izaberi",
 "Ok" => "Ok",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
 "Cancel" => "Otkaži",
@@ -45,7 +45,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "{owner} podelio sa Vama i grupom {group} ",
 "Shared with you by {owner}" => "Sa vama podelio {owner}",
 "Password protect" => "Zaštita lozinkom",
-"Password" => "Lozinka",
 "Email link to person" => "Pošalji link e-mailom",
 "Send" => "Pošalji",
 "Set expiration date" => "Datum isteka",
@@ -91,6 +90,7 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez generatora slučajnog broja napadač može predvideti token za reset lozinke i preuzeti Vaš nalog.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.",
 "Create an <strong>admin account</strong>" => "Napravi <strong>administrativni nalog</strong>",
+"Password" => "Lozinka",
 "Data folder" => "Fascikla podataka",
 "Configure the database" => "Podešavanje baze",
 "will be used" => "će biti korišćen",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index f24398c662..3258d03caf 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n månad sedan","%n månader sedan"),
 "last year" => "förra året",
 "years ago" => "år sedan",
-"Choose" => "Välj",
-"Error loading file picker template: {error}" => "Fel uppstod för filväljarmall: {error}",
 "Yes" => "Ja",
 "No" => "Nej",
+"Choose" => "Välj",
+"Error loading file picker template: {error}" => "Fel uppstod för filväljarmall: {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Fel uppstod under inläsningen av meddelandemallen: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Delad med dig av {owner}",
 "Share with user or group …" => "Dela med användare eller grupp...",
 "Share link" => "Dela länk",
+"The public link will expire no later than {days} days after it is created" => "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
+"By default the public link will expire after {days} days" => "Som standard kommer den publika länken att sluta gälla efter {days} dagar",
 "Password protect" => "Lösenordsskydda",
-"Password" => "Lösenord",
+"Choose a password for the public link" => "Välj ett lösenord för den publika länken",
 "Allow Public Upload" => "Tillåt publik uppladdning",
 "Email link to person" => "E-posta länk till person",
 "Send" => "Skicka",
@@ -150,6 +152,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>",
+"Password" => "Lösenord",
 "Storage & database" => "Lagring & databas",
 "Data folder" => "Datamapp",
 "Configure the database" => "Konfigurera databasen",
diff --git a/core/l10n/ta_IN.php b/core/l10n/ta_IN.php
new file mode 100644
index 0000000000..ffcdde48d4
--- /dev/null
+++ b/core/l10n/ta_IN.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/ta_LK.php b/core/l10n/ta_LK.php
index c0b4dce7cf..53c8cb1333 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "கடந்த வருடம்",
 "years ago" => "வருடங்களுக்கு முன்",
-"Choose" => "தெரிவுசெய்க ",
 "Yes" => "ஆம்",
 "No" => "இல்லை",
+"Choose" => "தெரிவுசெய்க ",
 "Ok" => "சரி",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "இரத்து செய்க",
@@ -45,7 +45,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}",
 "Shared with you by {owner}" => "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}",
 "Password protect" => "கடவுச்சொல்லை பாதுகாத்தல்",
-"Password" => "கடவுச்சொல்",
 "Set expiration date" => "காலாவதி தேதியை குறிப்பிடுக",
 "Expiration date" => "காலவதியாகும் திகதி",
 "Share via email:" => "மின்னஞ்சலினூடான பகிர்வு: ",
@@ -85,6 +84,7 @@ $TRANSLATIONS = array(
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "குறிப்பிட்ட எண்ணிக்கை பாதுகாப்பான புறப்பாக்கி / உண்டாக்கிகள் இல்லை, தயவுசெய்து PHP OpenSSL நீட்சியை இயலுமைப்படுத்துக. ",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "பாதுகாப்பான சீரற்ற எண்ணிக்கையான புறப்பாக்கி இல்லையெனின், தாக்குனரால் கடவுச்சொல் மீளமைப்பு அடையாளவில்லைகள் முன்மொழியப்பட்டு உங்களுடைய கணக்கை கைப்பற்றலாம்.",
 "Create an <strong>admin account</strong>" => "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
+"Password" => "கடவுச்சொல்",
 "Data folder" => "தரவு கோப்புறை",
 "Configure the database" => "தரவுத்தளத்தை தகவமைக்க",
 "will be used" => "பயன்படுத்தப்படும்",
diff --git a/core/l10n/te.php b/core/l10n/te.php
index 7b76349b85..7016cde75f 100644
--- a/core/l10n/te.php
+++ b/core/l10n/te.php
@@ -37,7 +37,6 @@ $TRANSLATIONS = array(
 "Cancel" => "రద్దుచేయి",
 "Continue" => "కొనసాగించు",
 "Error" => "పొరపాటు",
-"Password" => "సంకేతపదం",
 "Send" => "పంపించు",
 "Expiration date" => "కాలం చెల్లు తేదీ",
 "delete" => "తొలగించు",
@@ -49,6 +48,7 @@ $TRANSLATIONS = array(
 "Personal" => "వ్యక్తిగతం",
 "Users" => "వాడుకరులు",
 "Help" => "సహాయం",
+"Password" => "సంకేతపదం",
 "Log out" => "నిష్క్రమించు",
 "Lost your password?" => "మీ సంకేతపదం పోయిందా?"
 );
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 61a67f7802..314fa3e865 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array(""),
 "last year" => "ปีที่แล้ว",
 "years ago" => "ปี ที่ผ่านมา",
-"Choose" => "เลือก",
 "Yes" => "ตกลง",
 "No" => "ไม่ตกลง",
+"Choose" => "เลือก",
 "Ok" => "ตกลง",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "New Files" => "ไฟล์ใหม่",
@@ -47,7 +47,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}",
 "Shared with you by {owner}" => "ถูกแชร์ให้กับคุณโดย {owner}",
 "Password protect" => "ใส่รหัสผ่านไว้",
-"Password" => "รหัสผ่าน",
 "Email link to person" => "ส่งลิงก์ให้ทางอีเมล",
 "Send" => "ส่ง",
 "Set expiration date" => "กำหนดวันที่หมดอายุ",
@@ -93,6 +92,7 @@ $TRANSLATIONS = array(
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "ยังไม่มีตัวสร้างหมายเลขแบบสุ่มให้ใช้งาน, กรุณาเปิดใช้งานส่วนเสริม PHP OpenSSL",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "หากปราศจากตัวสร้างหมายเลขแบบสุ่มที่ช่วยป้องกันความปลอดภัย ผู้บุกรุกอาจสามารถที่จะคาดคะเนรหัสยืนยันการเข้าถึงเพื่อรีเซ็ตรหัสผ่าน และเอาบัญชีของคุณไปเป็นของตนเองได้",
 "Create an <strong>admin account</strong>" => "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
+"Password" => "รหัสผ่าน",
 "Data folder" => "โฟลเดอร์เก็บข้อมูล",
 "Configure the database" => "กำหนดค่าฐานข้อมูล",
 "will be used" => "จะถูกใช้",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index d5880d8a09..cf8e126b9a 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n ay önce","%n ay önce"),
 "last year" => "geçen yıl",
 "years ago" => "yıllar önce",
-"Choose" => "Seç",
-"Error loading file picker template: {error}" => "Dosya seçici şablonu yüklenirken hata: {error}",
 "Yes" => "Evet",
 "No" => "Hayır",
+"Choose" => "Seç",
+"Error loading file picker template: {error}" => "Dosya seçici şablonu yüklenirken hata: {error}",
 "Ok" => "Tamam",
 "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ı"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "{owner} tarafından sizinle paylaşıldı",
 "Share with user or group …" => "Kullanıcı veya grup ile paylaş...",
 "Share link" => "Paylaşma bağlantısı",
+"The public link will expire no later than {days} days after it is created" => "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek",
+"By default the public link will expire after {days} days" => "Öntanımlı olarak herkese açık bağlantı {days} gün sonra sona erecek",
 "Password protect" => "Parola koruması",
-"Password" => "Parola",
+"Choose a password for the public link" => "Herkese açık bağlantı için bir parola seçin",
 "Allow Public Upload" => "Herkes Tarafından Gönderime İzin Ver",
 "Email link to person" => "Bağlantıyı e-posta ile gönder",
 "Send" => "Gönder",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.",
 "Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun",
+"Password" => "Parola",
 "Storage & database" => "Depolama ve veritabanı",
 "Data folder" => "Veri klasörü",
 "Configure the database" => "Veritabanını yapılandır",
@@ -162,7 +165,7 @@ $TRANSLATIONS = array(
 "Finish setup" => "Kurulumu tamamla",
 "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. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.",
+"%s is available. Get more information on how to update." => "%s kullanılabilir. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.",
 "Log out" => "Çıkış yap",
 "Automatic logon rejected!" => "Otomatik oturum açma reddedildi!",
 "If you did not change your password recently, your account may be compromised!" => "Yakın zamanda parolanızı değiştirmediyseniz hesabınız tehlikede olabilir!",
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
index 9b92307035..a21c47fc76 100644
--- a/core/l10n/ug.php
+++ b/core/l10n/ug.php
@@ -34,7 +34,6 @@ $TRANSLATIONS = array(
 "Cancel" => "ۋاز كەچ",
 "Share" => "ھەمبەھىر",
 "Error" => "خاتالىق",
-"Password" => "ئىم",
 "Send" => "يوللا",
 "group" => "گۇرۇپپا",
 "Unshare" => "ھەمبەھىرلىمە",
@@ -50,6 +49,7 @@ $TRANSLATIONS = array(
 "Apps" => "ئەپلەر",
 "Help" => "ياردەم",
 "Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
+"Password" => "ئىم",
 "Finish setup" => "تەڭشەك تامام",
 "Log out" => "تىزىمدىن چىق"
 );
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 015183e647..95de28ce0c 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n місяць тому","%n місяці тому","%n місяців тому"),
 "last year" => "минулого року",
 "years ago" => "роки тому",
-"Choose" => "Обрати",
-"Error loading file picker template: {error}" => "Помилка при завантаженні шаблону вибору: {error}",
 "Yes" => "Так",
 "No" => "Ні",
+"Choose" => "Обрати",
+"Error loading file picker template: {error}" => "Помилка при завантаженні шаблону вибору: {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Помилка при завантаженні шаблону повідомлення: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} файловий конфлікт","{count} файлових конфліктів","{count} файлових конфліктів"),
@@ -72,7 +72,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Поділитися з користувачем або групою ...",
 "Share link" => "Опублікувати посилання",
 "Password protect" => "Захистити паролем",
-"Password" => "Пароль",
 "Allow Public Upload" => "Дозволити Публічне Завантаження",
 "Email link to person" => "Ел. пошта належить Пану",
 "Send" => "Надіслати",
@@ -146,6 +145,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що  .htaccess файл не працює.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Для отримання інформації, як правильно налаштувати сервер, див. <a href=\"%s\" target=\"_blank\">документацію</a>.",
 "Create an <strong>admin account</strong>" => "Створити <strong>обліковий запис адміністратора</strong>",
+"Password" => "Пароль",
 "Data folder" => "Каталог даних",
 "Configure the database" => "Налаштування бази даних",
 "will be used" => "буде використано",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index 3012eb869c..50a0e14c68 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -1,5 +1,19 @@
 <?php
 $TRANSLATIONS = array(
+"Expiration date is in the past." => "ختم ہونے کی تاریخ ماضی میں ہے.",
+"Turned on maintenance mode" => "بحالی موڈ چالو ہے",
+"Turned off maintenance mode" => "بحالی موڈ بند ہے",
+"Updated database" => "اپ ڈیٹ ہوئ ڈیٹا بیس",
+"No image or file provided" => "کوئی تصویر یا فائل فراہم نہیں",
+"Unknown filetype" => "غیر معرروف قسم کی فائل",
+"Invalid image" => "غلط تصویر",
+"Sunday" => "اتوار",
+"Monday" => "سوموار",
+"Tuesday" => "منگل",
+"Wednesday" => "بدھ",
+"Thursday" => "جمعرات",
+"Friday" => "جمعہ",
+"Saturday" => "ہفتہ",
 "January" => "جنوری",
 "February" => "فرورئ",
 "March" => "مارچ",
@@ -12,51 +26,105 @@ $TRANSLATIONS = array(
 "October" => "اکتوبر",
 "November" => "نومبر",
 "December" => "دسمبر",
-"Settings" => "سیٹینگز",
+"Settings" => "ترتیبات",
+"Saving..." => "محفوظ ھو رہا ہے ...",
+"seconds ago" => "سیکنڈز پہلے",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
+"today" => "آج",
+"yesterday" => "کل",
 "_%n day ago_::_%n days ago_" => array("",""),
+"last month" => "پچھلے مہنیے",
 "_%n month ago_::_%n months ago_" => array("",""),
-"Choose" => "منتخب کریں",
+"last year" => "پچھلے سال",
+"years ago" => "سالوں پہلے",
 "Yes" => "ہاں",
 "No" => "نہیں",
+"Choose" => "منتخب کریں",
 "Ok" => "اوکے",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"New Files" => "جدید فائلیں",
+"Already existing files" => "پہلے سے موجودجدید فائلیں",
 "Cancel" => "منسوخ کریں",
-"Error" => "ایرر",
-"Error while sharing" => "شئیرنگ کے دوران ایرر",
-"Error while unsharing" => "شئیرنگ ختم کرنے  کے دوران ایرر",
-"Error while changing permissions" => "اختیارات کو تبدیل کرنے کے دوران ایرر",
-"Password protect" => "پاسورڈ سے محفوظ کریں",
-"Password" => "پاسورڈ",
+"Continue" => "جاری",
+"(all selected)" => "(سب منتخب شدہ)",
+"({count} selected)" => "({گنتی} منتخب شدہ)",
+"Very weak password" => "بہت کمزور پاسورڈ",
+"Weak password" => "کمزور پاسورڈ",
+"So-so password" => "نص نص پاسورڈ",
+"Good password" => "اچھا پاسورڈ",
+"Strong password" => "مضبوط پاسورڈ",
+"Shared" => "اشتراک شدہ",
+"Share" => "اشتراک",
+"Error" => "خرابی",
+"Error while sharing" => "اشتراک کے دوران خرابی ",
+"Error while unsharing" => "اشترک ختم کرنے کے دوران خرابی",
+"Error while changing permissions" => "اختیارات کو تبدیل کرنے کے دوران  خرابی ",
+"Shared with you and the group {group} by {owner}" => "آپ اور گروہ سے مشترق شدہ {گروہ } سے {مالک}",
+"Shared with you by {owner}" => "اشتراک شدہ آپ سے{مالک}",
+"Share with user or group …" => "صارف یا مجموعہ کے ساتھ اشتراک کریں ...",
+"Share link" => "اشتراک لنک",
+"By default the public link will expire after {days} days" => "ڈیفالٹ میں عوامی لنک ختم ہو جائے گا {دن} دن",
+"Password protect" => "محفوظ پاسورڈ",
+"Choose a password for the public link" => "عوامی لنک کے لئےپاس ورڈ منتخب کریں",
+"Allow Public Upload" => "پبلک اپ لوڈ کرنے کی اجازت دیں",
+"Email link to person" => "شحص کے لیے ای میل لنک",
+"Send" => "بھجیں",
 "Set expiration date" => "تاریخ معیاد سیٹ کریں",
 "Expiration date" => "تاریخ معیاد",
-"No people found" => "کوئی لوگ نہیں ملے۔",
-"Resharing is not allowed" => "دوبارہ شئیر کرنے کی اجازت نہیں",
+"Share via email:" => "ای میل کے زریعے ارسال کریں",
+"No people found" => "کوئ شخص موجود نہیں ",
+"group" => "مجموعہ",
+"Resharing is not allowed" => "دوبارہ اشتراک کی اجازت نہیں",
+"Shared in {item} with {user}" => "شراکت میں {آئٹم}اور {مستخدم}",
 "Unshare" => "شئیرنگ ختم کریں",
-"can edit" => "ایڈٹ کر سکے",
+"notify by email" => "ای میل کے ذریعے مطلع کریں",
+"can edit" => "تبدیل کر سکے ھیں",
 "access control" => "اسیس کنٹرول",
 "create" => "نیا بنائیں",
 "update" => "اپ ڈیٹ",
 "delete" => "ختم کریں",
 "share" => "شئیر کریں",
 "Password protected" => "پاسورڈ سے محفوظ کیا گیا ہے",
+"Error unsetting expiration date" => "خرابی غیر تصحیح تاریخ معیاد",
+"Error setting expiration date" => "خرابی  تصحیح تاریخ معیاد",
+"Sending ..." => "ارسال ہو رہا ھے",
+"Email sent" => "ارسال شدہ ای میل ",
+"Warning" => "انتباہ",
+"The object type is not specified." => "اس چیز کی قسم کی وضاحت نہیں",
+"Enter new" => "جدید درج کریں",
+"Delete" => "حذف کریں",
 "Add" => "شامل کریں",
+"Edit tags" => "ترمیم ٹیگز",
+"Please reload the page." => "براہ مہربانی صفحہ دوبارہ لوڈ کریں.",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "اپ ڈیٹ نا کامیاب تھی۔ براہ مہربانی اس مسلے کو رپورٹ کریں اس پے  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>. ",
+"The update was successful. Redirecting you to ownCloud now." => "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے",
+"A problem has occurred whilst sending the email, please contact your administrator." => "ای میل بھیجنے کے دوران ایک مسئلہ پیش آیا ہے , براہ مہربانی اپنےایڈمنسٹریٹر سے رابطہ کریں.",
 "Use the following link to reset your password: {link}" => "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
+"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" => "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں",
+"Reset" => "ری سیٹ",
 "Your password was reset" => "آپ کا پاسورڈ ری سیٹ کر دیا گیا ہے",
 "To login page" => "لاگ ان صفحے کی طرف",
 "New password" => "نیا پاسورڈ",
 "Reset password" => "ری سیٹ پاسورڈ",
-"Personal" => "ذاتی",
-"Users" => "یوزرز",
+"Personal" => "شخصی",
+"Users" => "صارفین",
 "Apps" => "ایپز",
 "Admin" => "ایڈمن",
 "Help" => "مدد",
-"Access forbidden" => "پہنچ کی اجازت نہیں",
-"Cloud not found" => "نہیں مل سکا",
+"Access forbidden" => "رسائ منقطع ہے",
+"Cloud not found" => "کلوڈ موجود نہہں",
+"Cheers!" => "واہ!",
+"Security Warning" => "حفاظتی انتباہ",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "آپ کا پی ایچ پی ورین نل بائٹ کے حملے کے خطرے سے دوچار  ہے (CVE-2006-7243)",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "کوئ محفوظ بے ترتیب نمبر جنریٹر موجود نہیں مہربانی کر کے پی ایچ پی اوپن ایس ایس ایل ایکسٹنشن  چالو کریں.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ایک محفوظ بے ترتیب نمبر جنریٹر کے بغیر ایک حملہ آور پاس ورڈ ری سیٹ ٹوکن کی پیشن گوئی کرنے کے قابل اور اپ کے حساب پر قبضہ کر سکتا ہے",
 "Create an <strong>admin account</strong>" => "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
+"Password" => "پاسورڈ",
+"Storage & database" => "ذخیرہ اور ڈیٹا بیس",
 "Data folder" => "ڈیٹا فولڈر",
 "Configure the database" => "ڈیٹا بیس کونفگر کریں",
 "will be used" => "استعمال ہو گا",
@@ -66,9 +134,17 @@ $TRANSLATIONS = array(
 "Database tablespace" => "ڈیٹابیس ٹیبل سپیس",
 "Database host" => "ڈیٹابیس ہوسٹ",
 "Finish setup" => "سیٹ اپ ختم کریں",
+"Finishing …" => "تکمیل ...",
+"%s is available. Get more information on how to update." => "%s دستیاب ہے. اپ ڈیٹ کرنے کے  بارے میں مزید معلومات حاصل کریں.",
 "Log out" => "لاگ آؤٹ",
+"Automatic logon rejected!" => "آٹومیٹک لاگ ان مسترد",
+"If you did not change your password recently, your account may be compromised!" => "آپ نے حال ہی میں اپنا پاس ورڈ تبدیل نہیں کیا تو، آپ کے اکاؤنٹ سے سمجھوتہ ہو سکتا ہے",
+"Please change your password to secure your account again." => "براہ مہربانی پھر سے اکاونٹ محفوظ کرنے کے لیے  اپنا پاس ورڈ تبدیل کریں.",
 "Lost your password?" => "کیا آپ پاسورڈ بھول گئے ہیں؟",
 "remember" => "یاد رکھیں",
-"Log in" => "لاگ ان"
+"Log in" => "لاگ ان",
+"Alternative Logins" => "متبادل لاگ ان ",
+"Thank you for your patience." => "آپ کے صبر کا شکریہ",
+"Updating ownCloud to version %s, this may take a while." => "اون کلوڈ اپ ڈیٹ ہو رہا ہے ورژن %s میں, یہ تھوڑی دیر لےگا"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index fe24cb385e..07ac648c91 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n tháng trước"),
 "last year" => "năm trước",
 "years ago" => "năm trước",
-"Choose" => "Chọn",
-"Error loading file picker template: {error}" => "Lỗi khi tải mẫu tập tin picker: {error}",
 "Yes" => "Có",
 "No" => "Không",
+"Choose" => "Chọn",
+"Error loading file picker template: {error}" => "Lỗi khi tải mẫu tập tin picker: {error}",
 "Ok" => "Đồng ý",
 "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"),
@@ -67,7 +67,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Chia sẻ với người dùng hoặc nhóm",
 "Share link" => "Chia sẻ liên kết",
 "Password protect" => "Mật khẩu bảo vệ",
-"Password" => "Mật khẩu",
 "Allow Public Upload" => "Cho phép công khai tập tin tải lên",
 "Email link to person" => "Liên kết email tới cá nhân",
 "Send" => "Gởi",
@@ -138,6 +137,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.",
 "Create an <strong>admin account</strong>" => "Tạo một <strong>tài khoản quản trị</strong>",
+"Password" => "Mật khẩu",
 "Data folder" => "Thư mục dữ liệu",
 "Configure the database" => "Cấu hình cơ sở dữ liệu",
 "will be used" => "được sử dụng",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index b068d42567..46510f5a1a 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -1,5 +1,6 @@
 <?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" => "关闭维护模式",
@@ -40,15 +41,16 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n 月前"),
 "last year" => "去年",
 "years ago" => "年前",
-"Choose" => "选择(&C)...",
-"Error loading file picker template: {error}" => "加载文件分拣模板出错: {error}",
 "Yes" => "是",
 "No" => "否",
+"Choose" => "选择(&C)...",
+"Error loading file picker template: {error}" => "加载文件分拣模板出错: {error}",
 "Ok" => "好",
 "Error loading message template: {error}" => "加载消息模板出错: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} 个文件冲突"),
 "One file conflict" => "1个文件冲突",
 "New Files" => "新文件",
+"Already existing 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" => "取消",
@@ -56,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" => "错误",
@@ -67,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "分享给其他用户或组 ...",
 "Share link" => "分享链接",
 "Password protect" => "密码保护",
-"Password" => "密码",
 "Allow Public Upload" => "允许公开上传",
 "Email link to person" => "发送链接到个人",
 "Send" => "发送",
@@ -103,6 +109,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "更新不成功。请汇报将此问题汇报给  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社区</a>。",
 "The update was successful. Redirecting you to ownCloud now." => "更新成功。正在重定向至 ownCloud。",
 "%s password reset" => "重置 %s 的密码",
+"A problem has occurred whilst sending the email, please contact your administrator." => "发送电子邮件时发生问题，请和管理员联系。",
 "Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "重置密码的链接已发送到您的邮箱。<br>如果您觉得在合理的时间内还未收到邮件，请查看 spam/junk 目录。<br>如果没有在那里，请询问您的本地管理员。",
 "Request failed!<br>Did you make sure your email/username was right?" => "请求失败<br>您确定您的邮箱/用户名是正确的？",
@@ -115,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "到登录页面",
 "New password" => "新密码",
 "Reset password" => "重置密码",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！",
+"For the best results, please consider using a GNU/Linux server instead." => "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。",
 "Personal" => "个人",
 "Users" => "用户",
 "Apps" => "应用",
@@ -140,6 +149,8 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。",
 "Create an <strong>admin account</strong>" => "创建<strong>管理员账号</strong>",
+"Password" => "密码",
+"Storage & database" => "存储 & 数据库",
 "Data folder" => "数据目录",
 "Configure the database" => "配置数据库",
 "will be used" => "将被使用",
@@ -162,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/zh_HK.php b/core/l10n/zh_HK.php
index 294fa7d6fe..57653c1fab 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "{owner}與你及群組的分享",
 "Shared with you by {owner}" => "{owner}與你的分享",
 "Password protect" => "密碼保護",
-"Password" => "密碼",
 "Send" => "傳送",
 "Set expiration date" => "設定分享期限",
 "Expiration date" => "分享期限",
@@ -72,6 +71,7 @@ $TRANSLATIONS = array(
 "Help" => "幫助",
 "Cloud not found" => "未找到Cloud",
 "Create an <strong>admin account</strong>" => "建立管理員帳戶",
+"Password" => "密碼",
 "Configure the database" => "設定資料庫",
 "will be used" => "將被使用",
 "Database user" => "資料庫帳戶",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 465ae0c700..dffb890f13 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n 個月前"),
 "last year" => "去年",
 "years ago" => "幾年前",
-"Choose" => "選擇",
-"Error loading file picker template: {error}" => "載入檔案選擇器樣板出錯： {error}",
 "Yes" => "是",
 "No" => "否",
+"Choose" => "選擇",
+"Error loading file picker template: {error}" => "載入檔案選擇器樣板出錯： {error}",
 "Ok" => "好",
 "Error loading message template: {error}" => "載入訊息樣板出錯： {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} 個檔案衝突"),
@@ -72,7 +72,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "與用戶或群組分享",
 "Share link" => "分享連結",
 "Password protect" => "密碼保護",
-"Password" => "密碼",
 "Allow Public Upload" => "允許任何人上傳",
 "Email link to person" => "將連結 email 給別人",
 "Send" => "寄出",
@@ -142,6 +141,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>",
+"Password" => "密碼",
 "Data folder" => "資料儲存位置",
 "Configure the database" => "設定資料庫",
 "will be used" => "將會使用",
diff --git a/core/register_command.php b/core/register_command.php
index 2efa838e9e..f1361c859f 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -9,6 +9,7 @@
 /** @var $application Symfony\Component\Console\Application */
 $application->add(new OC\Core\Command\Status);
 $application->add(new OC\Core\Command\Db\GenerateChangeScript());
+$application->add(new OC\Core\Command\Db\ConvertType(OC_Config::getObject(), new \OC\DB\ConnectionFactory()));
 $application->add(new OC\Core\Command\Upgrade());
 $application->add(new OC\Core\Command\Maintenance\SingleUser());
 $application->add(new OC\Core\Command\App\Disable());
diff --git a/core/routes.php b/core/routes.php
index 74be880612..5368fd4564 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -66,6 +66,8 @@ $this->create('core_tags_delete', '/tags/{type}/delete')
 $this->create('js_config', '/core/js/oc.js')
 	->actionInclude('core/js/config.php');
 // Routing
+$this->create('core_ajax_preview', '/core/preview')
+	->actionInclude('core/ajax/preview.php');
 $this->create('core_ajax_preview', '/core/preview.png')
 	->actionInclude('core/ajax/preview.php');
 $this->create('core_lostpassword_index', '/lostpassword/')
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 1f89e3f040..d38dc24d9c 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -35,14 +35,15 @@
 	<?php flush(); ?>
 	<body id="body-login">
 		<div class="wrapper"><!-- for sticky footer -->
-			<header><div id="header">
-				<div class="logo svg"></div>
-				<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
-			</div></header>
-
-			<?php print_unescaped($_['content']); ?>
+			<div class="v-align"><!-- vertically centred box -->
+				<header><div id="header">
+					<div class="logo svg"></div>
+					<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
+				</div></header>
 
+				<?php print_unescaped($_['content']); ?>
 			<div class="push"></div><!-- for sticky footer -->
+			</div>
 		</div>
 
 		<footer>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index a217446ca7..b0ae8637ac 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -123,7 +123,7 @@
 		</div></nav>
 
 		<div id="content-wrapper">
-			<div id="content">
+			<div id="content" class="app-<?php p($_['appid']) ?>">
 				<?php print_unescaped($_['content']); ?>
 			</div>
 		</div>
diff --git a/core/templates/login.php b/core/templates/login.php
index b534e1edea..669d20b32e 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -47,11 +47,11 @@
 		</a>
 		<?php endif; ?>
 		<?php if ($_['rememberLoginAllowed'] === true) : ?>
-		<input type="checkbox" name="remember_login" value="1" id="remember_login" checked />
+		<input type="checkbox" name="remember_login" value="1" id="remember_login" />
 		<label for="remember_login"><?php p($l->t('remember')); ?></label>
 		<?php endif; ?>
 		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
-		<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>"/>
+		<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>" disabled="disabled"/>
 	</fieldset>
 </form>
 <?php if (!empty($_['alt_login'])) { ?>
diff --git a/l10n/ach/core.po b/l10n/ach/core.po
index 508df40e1d..e8135c1c76 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/ach/files.po b/l10n/ach/files.po
index 8f1326b553..cdb5e04d8a 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ach/files_external.po b/l10n/ach/files_external.po
index 5170057923..6dd6eaa3e5 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: ach\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ach/files_sharing.po b/l10n/ach/files_sharing.po
index 37a1f4ea88..db8560cb3d 100644
--- a/l10n/ach/files_sharing.po
+++ b/l10n/ach/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: ach\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ach/files_trashbin.po b/l10n/ach/files_trashbin.po
index 96c38828dd..b676ed2f55 100644
--- a/l10n/ach/files_trashbin.po
+++ b/l10n/ach/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/ach/lib.po b/l10n/ach/lib.po
index 46c7a5046e..832d0ceadc 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: ach\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/ach/settings.po b/l10n/ach/settings.po
index df5507bffc..6f75ff4370 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ady/core.po b/l10n/ady/core.po
index 2641da3bfc..a677785c37 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/ady/files.po b/l10n/ady/files.po
index a5f9b453f4..57bbfa0a85 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ady/files_external.po b/l10n/ady/files_external.po
index 777a46c36c..1c5cdcdc02 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: ady\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ady/files_sharing.po b/l10n/ady/files_sharing.po
index 62d961f352..e27f7d01c6 100644
--- a/l10n/ady/files_sharing.po
+++ b/l10n/ady/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: ady\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ady/files_trashbin.po b/l10n/ady/files_trashbin.po
index 65927975a2..753c7b8e19 100644
--- a/l10n/ady/files_trashbin.po
+++ b/l10n/ady/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/ady/lib.po b/l10n/ady/lib.po
index 5bf5a1f891..a30aac72a6 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: ady\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/ady/settings.po b/l10n/ady/settings.po
index 4117495a19..f8a3debb9d 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 43f137c436..487216dbb4 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 12:53+0000\n"
-"Last-Translator: HannesNell <hannesn@workforce.co.za>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ajax/share.php:87
 msgid "Expiration date is in the past."
-msgstr ""
+msgstr "Verval datum is in die verlede."
 
 #: ajax/share.php:119 ajax/share.php:161
 #, php-format
@@ -30,11 +30,11 @@ msgstr ""
 
 #: ajax/update.php:10
 msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Instandhouding aangeskakel"
 
 #: ajax/update.php:13
 msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Instandhouding uitgeskakel"
 
 #: ajax/update.php:16
 msgid "Updated database"
@@ -42,7 +42,7 @@ msgstr ""
 
 #: avatar/controller.php:62
 msgid "No image or file provided"
-msgstr ""
+msgstr "Geen prent of lêer voorsien"
 
 #: avatar/controller.php:81
 msgid "Unknown filetype"
@@ -60,79 +60,79 @@ msgstr "Geen tydelike profiel foto beskikbaar nie, probeer weer"
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Sondag"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Mandag"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Vrydag"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Saterdag"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Januarie"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februarie"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Maart"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "April"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mei"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Junie"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Julie"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Augustus"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Desember"
 
@@ -142,7 +142,7 @@ msgstr "Instellings"
 
 #: js/js.js:583
 msgid "Saving..."
-msgstr ""
+msgstr "Stoor..."
 
 #: js/js.js:1240
 msgid "seconds ago"
@@ -157,8 +157,8 @@ msgstr[1] "%n minute gelede"
 #: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n ure gelde"
+msgstr[1] "%n ure gelede"
 
 #: js/js.js:1243
 msgid "today"
@@ -171,8 +171,8 @@ msgstr "gister"
 #: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n dae gelede"
+msgstr[1] "%n dae gelede"
 
 #: js/js.js:1246
 msgid "last month"
@@ -181,8 +181,8 @@ msgstr "verlede maand"
 #: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n maande gelede"
+msgstr[1] "%n maande gelede"
 
 #: js/js.js:1248
 msgid "last year"
@@ -192,75 +192,75 @@ msgstr "verlede jaar"
 msgid "years ago"
 msgstr "jare gelede"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Kies"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nee"
 
-#: js/oc-dialogs.js:204
-msgid "Ok"
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Kies"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr "OK"
+
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
-msgstr ""
+msgstr "Nuwe leêrs"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
-msgstr ""
+msgstr "Bestaande leêrs"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Kanseleer"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Gaan voort"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -274,7 +274,7 @@ msgstr "Swak wagwoord"
 
 #: js/setup.js:86
 msgid "So-so password"
-msgstr ""
+msgstr "So-so wagwoord"
 
 #: js/setup.js:87
 msgid "Good password"
@@ -292,18 +292,18 @@ msgstr "Gedeel"
 msgid "Share"
 msgstr "Deel"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Fout"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
-msgstr ""
+msgstr "Deel veroorsaak fout"
 
 #: js/share.js:171
 msgid "Error while unsharing"
-msgstr ""
+msgstr "Deel terugneem veroorsaak fout"
 
 #: js/share.js:178
 msgid "Error while changing permissions"
@@ -325,113 +325,122 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Beskerm met Wagwoord"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Wagwoord"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Laat Publieke Oplaai toe"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "E-pos aan persoon"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Stuur"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Stel verval datum"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Verval datum"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
-msgstr ""
+msgstr "Deel oor epos:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
-msgstr ""
+msgstr "Geen persoon gevind"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "groep"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Hernieu deel is nie toegelaat nie "
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Gedeel in {item} met {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
-msgstr ""
+msgstr "Deel terug neem"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "kan wysig"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "toegang beheer"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "skep"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "opdateer"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "uitvee"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "deel"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
-msgstr "Beskerm met Wagwoord"
+msgstr "Beskerm met wagwoord"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Fout met skrapping van verval datum"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Fout met opstel van verval datum"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Stuur ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "E-pos gestuur"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
 #: js/tags.js:4
 msgid "The object type is not specified."
-msgstr ""
+msgstr "Hierdie objek tipe is nie gespesifiseer nie."
 
 #: js/tags.js:13
 msgid "Enter new"
@@ -466,11 +475,11 @@ 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 "Die opdateering was nie suksesvol nie. Raporteer die probleem by <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+msgstr "Die opdatering was nie suksesvol nie. Rapporteer die probleem by <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
 
 #: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei."
 
 #: lostpassword/controller.php:70
 #, php-format
@@ -549,7 +558,7 @@ msgstr ""
 #: setup/controller.php:144
 msgid ""
 "For the best results, please consider using a GNU/Linux server instead."
-msgstr ""
+msgstr "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate."
 
 #: strings.php:5
 msgid "Personal"
@@ -644,13 +653,13 @@ msgstr "Opdateer asseblief jou PHP instelasie om %s veilig te gebruik"
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Geen moontlikheid om 'n ewekansige getal genereer nie. Stel asb. die PHP OpenSSL byvoeging in werking."
 
 #: templates/installation.php:34
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr ""
+msgstr "Sonder die moontlikheid om 'n ewekansige getal te genereer kan 'n aanvaller wagwoord herstel tekens voorspel en jou rekening oor neem."
 
 #: templates/installation.php:40
 msgid ""
@@ -669,6 +678,10 @@ msgstr "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien assebli
 msgid "Create an <strong>admin account</strong>"
 msgstr "Skep `n <strong>admin-rekening</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Wagwoord"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
@@ -737,7 +750,7 @@ msgstr "Automatiese aantekening afgekeur!"
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr ""
+msgstr "Jou rekening kan gekompromitteer wees, as jy jou wagwoord nie onlangs verander het nie."
 
 #: templates/login.php:12
 msgid "Please change your password to secure your account again."
@@ -765,14 +778,14 @@ msgstr "Teken aan"
 
 #: templates/login.php:60
 msgid "Alternative Logins"
-msgstr ""
+msgstr "Alternatiewe aantekeninge"
 
 #: 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 ""
+msgstr "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
@@ -795,7 +808,7 @@ msgstr ""
 #: templates/update.admin.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "Opdatering a ownCloud versie %s - dit kan 'n tydjie vat."
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index c6733f8070..3df459eab3 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
-msgstr ""
+msgstr "Deel"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/af_ZA/files_external.po b/l10n/af_ZA/files_external.po
index 03a9505a52..c674876b56 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Wagwoord"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Deel"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po
index d2b21bc6a2..bb437c8dba 100644
--- a/l10n/af_ZA/files_sharing.po
+++ b/l10n/af_ZA/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/af_ZA/files_trashbin.po b/l10n/af_ZA/files_trashbin.po
index 8fb4f5b930..82eab21d03 100644
--- a/l10n/af_ZA/files_trashbin.po
+++ b/l10n/af_ZA/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index 7e3987e6eb..94e677074a 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "webdienste onder jou beheer"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
@@ -414,7 +423,7 @@ msgstr[1] ""
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n ure gelede"
 
 #: private/template/functions.php:137
 msgid "today"
@@ -428,7 +437,7 @@ msgstr ""
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n dae gelede"
 
 #: private/template/functions.php:142
 msgid "last month"
@@ -438,7 +447,7 @@ msgstr ""
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n maande gelede"
 
 #: private/template/functions.php:145
 msgid "last year"
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index d0c9432d92..6455b5a412 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
-msgstr ""
+msgstr "So-so wagwoord"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 4fefd23b90..9bad2da0dd 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 12:53+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
diff --git a/l10n/ak/core.po b/l10n/ak/core.po
index 2314857d23..522abffce9 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/ak/files.po b/l10n/ak/files.po
index dfca2f9b5e..5dc09dafd4 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ak/files_external.po b/l10n/ak/files_external.po
index 84c7c7e404..c57c4d3673 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: ak\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ak/files_sharing.po b/l10n/ak/files_sharing.po
index 6e19fe894d..b647d7fb85 100644
--- a/l10n/ak/files_sharing.po
+++ b/l10n/ak/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: ak\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ak/files_trashbin.po b/l10n/ak/files_trashbin.po
index 56c75b3a35..dd86037938 100644
--- a/l10n/ak/files_trashbin.po
+++ b/l10n/ak/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/ak/lib.po b/l10n/ak/lib.po
index b55a9ef3de..202944d50f 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: ak\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/ak/settings.po b/l10n/ak/settings.po
index 300b60d574..2f69543854 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/am_ET/core.po b/l10n/am_ET/core.po
index 3d756941bf..7d1e0c3a2c 100644
--- a/l10n/am_ET/core.po
+++ b/l10n/am_ET/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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/am_ET/files.po b/l10n/am_ET/files.po
index c6d33b423d..548d5a2bc3 100644
--- a/l10n/am_ET/files.po
+++ b/l10n/am_ET/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/am_ET/files_external.po b/l10n/am_ET/files_external.po
index 7b7292cc4f..30cc3f96e2 100644
--- a/l10n/am_ET/files_external.po
+++ b/l10n/am_ET/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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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"
@@ -17,6 +17,166 @@ msgstr ""
 "Language: am_ET\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/am_ET/files_sharing.po b/l10n/am_ET/files_sharing.po
index 5df40a5570..476d68ce16 100644
--- a/l10n/am_ET/files_sharing.po
+++ b/l10n/am_ET/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-26 01:55-0400\n"
-"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"POT-Creation-Date: 2014-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: am_ET\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/am_ET/files_trashbin.po b/l10n/am_ET/files_trashbin.po
index 5c0bf63448..368b38b55e 100644
--- a/l10n/am_ET/files_trashbin.po
+++ b/l10n/am_ET/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-26 01:55-0400\n"
-"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/am_ET/lib.po b/l10n/am_ET/lib.po
index e8c8371d58..ef169aaa83 100644
--- a/l10n/am_ET/lib.po
+++ b/l10n/am_ET/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -17,12 +17,15 @@ msgstr ""
 "Language: am_ET\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/am_ET/settings.po b/l10n/am_ET/settings.po
index 9555001471..9bce30b1d7 100644
--- a/l10n/am_ET/settings.po
+++ b/l10n/am_ET/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 2f3200cf40..854e6e9e00 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Abderraouf Mehdi Bouhali <armbouhali@gmail.com>, 2014
+# m3tz.gh <moataz-net@hotmail.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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,7 +39,7 @@ msgstr ""
 
 #: ajax/update.php:16
 msgid "Updated database"
-msgstr ""
+msgstr "قاعدة بيانات المرفوعات"
 
 #: avatar/controller.php:62
 msgid "No image or file provided"
@@ -60,95 +61,95 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "الأحد"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "الأثنين"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "الثلاثاء"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "الاربعاء"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "الخميس"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "الجمعه"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "السبت"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "كانون الثاني"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "شباط"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "آذار"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "نيسان"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "أيار"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "حزيران"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "تموز"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "آب"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "أيلول"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "تشرين الاول"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "تشرين الثاني"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "كانون الاول"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "إعدادات"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "جاري الحفظ..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "منذ ثواني"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -158,7 +159,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -168,15 +169,15 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "اليوم"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "يوم أمس"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -186,11 +187,11 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "الشهر الماضي"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -200,39 +201,39 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "السنةالماضية"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "سنة مضت"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "اختيار"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "نعم"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "لا"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "اختيار"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "موافق"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
@@ -242,45 +243,45 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "الغاء"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -312,12 +313,12 @@ msgstr "مشارك"
 msgid "Share"
 msgstr "شارك"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "خطأ"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "حصل خطأ عند عملية المشاركة"
 
@@ -345,107 +346,116 @@ msgstr ""
 msgid "Share link"
 msgstr "شارك الرابط"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+#: js/share.js:235
+msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr "اسمح بالرفع للعامة"
+
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "ارسل الرابط بالبريد الى صديق"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "أرسل"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "تعيين تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "مشاركة عبر البريد الإلكتروني:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "لم يتم العثور على أي شخص"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "مجموعة"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "لا يسمح بعملية إعادة المشاركة"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "شورك في {item} مع {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "إلغاء مشاركة"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "التحرير مسموح"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "ضبط الوصول"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "إنشاء"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "تحديث"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "حذف"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "مشاركة"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "محمي بكلمة السر"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "جاري الارسال ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "تم ارسال البريد الالكتروني"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "تحذير"
 
@@ -689,6 +699,10 @@ msgstr "لمزيد من المعلومات عن كيفية إعداد خادمك
 msgid "Create an <strong>admin account</strong>"
 msgstr "أضف </strong>مستخدم رئيسي <strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "كلمة المرور"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index cae4100b64..6915f1b4d6 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -29,7 +29,7 @@ msgstr "فشل في نقل الملف %s - يوجد ملف بنفس هذا ال
 msgid "Could not move %s"
 msgstr "فشل في نقل %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "اسم الملف لا يجوز أن يكون فارغا"
 
@@ -38,18 +38,18 @@ msgstr "اسم الملف لا يجوز أن يكون فارغا"
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "اسم غير صحيح , الرموز  '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها"
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -141,28 +141,32 @@ msgstr "فشلت عملية الرفع. تعذر الحصول على معلوم
 msgid "Invalid directory."
 msgstr "مسار غير صحيح."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "الملفات"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "تم إلغاء عملية رفع الملفات ."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "تعذر الحصول على نتيجة من الخادم"
 
@@ -175,55 +179,77 @@ msgstr "عملية رفع الملفات قيد التنفيذ. اغلاق ال
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} موجود مسبقا"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "شارك"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "حذف بشكل دائم"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "إعادة تسميه"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "حدث خطأ أثناء نقل الملف"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير."
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "خطأ"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "قيد الانتظار"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "حدث خطأ أثناء نقل الملف"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "خطأ"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "اسم"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "حجم"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "معدل"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "لا يوجد مجلدات %n"
@@ -233,7 +259,7 @@ msgstr[3] "عدد قليل من مجلدات %n"
 msgstr[4] "عدد كبير من مجلدات %n"
 msgstr[5] "مجلدات %n"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "لا يوجد ملفات %n"
@@ -243,11 +269,7 @@ msgstr[3] "قليل من ملفات %n"
 msgstr[4] "الكثير من ملفات %n"
 msgstr[5] " ملفات %n"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} و {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "لا يوجد ملفات %n لتحميلها"
@@ -257,61 +279,47 @@ msgstr[3] "يتم تحميل عدد قليل من ملفات %n"
 msgstr[4] "يتم تحميل عدد كبير من ملفات %n"
 msgstr[5] "يتم تحميل ملفات %n"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "مساحتك التخزينية امتلأت تقريبا "
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى."
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "تم تعطيل التشفير لكن ملفاتك لا تزال مشفرة. فضلا اذهب إلى الإعدادات الشخصية لإزالة التشفير عن ملفاتك."
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
-msgstr "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} و {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "اسم"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "حجم"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "معدل"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s  لا يمكن إعادة تسميته. "
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -348,68 +356,75 @@ msgstr "الحد الأقصى المسموح به لملفات ZIP"
 msgid "Save"
 msgstr "حفظ"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "جديد"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "ملف"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "مجلد جديد"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "مجلد"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "من رابط"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "حذف الملفات"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "إلغاء رفع الملفات"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "إلغاء"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "حجم الترفيع أعلى من المسموح"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم."
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "يرجى الانتظار , جاري فحص الملفات ."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "الفحص الحالي"
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index 345a782cd7..98a7a913d7 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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,6 +18,166 @@ 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"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "المكان"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "المضيف"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "إسم المستخدم"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "كلمة السر"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "شارك"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "عنوان الموقع"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -42,29 +202,29 @@ msgstr ""
 msgid "Saved"
 msgstr "حفظ"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index 103ad5d237..33e3b7bf72 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-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"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "مشاركة من طرف {owner}"
 
@@ -58,16 +58,15 @@ msgstr "المشاركة غير مفعلة"
 msgid "For more info, please ask the person who sent this link."
 msgstr "لمزيد من المعلومات، يرجى سؤال الشخص الذي أرسل هذا الرابط"
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "مشاركة من قبل %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "تحميل"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "تحميل %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "رابط مباشر"
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index 7576d350df..193bc9338b 100644
--- a/l10n/ar/files_trashbin.po
+++ b/l10n/ar/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: Abderraouf Mehdi Bouhali <armbouhali@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,38 +28,34 @@ msgstr "تعذّر حذف%s بشكل دائم"
 msgid "Couldn't restore %s"
 msgstr "تعذّر استرجاع %s "
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "اسم"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "استعيد"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "خطأ"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "تمت الاستعادة"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "لا يوجد شيء هنا. سلة المهملات خاليه."
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "اسم"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "تم الحذف"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "إلغاء"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 7271b01144..4358b7ab58 100644
--- a/l10n/ar/lib.po
+++ b/l10n/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +19,15 @@ 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"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -75,23 +78,23 @@ msgstr "الصورة غير صالحة"
 msgid "web services under your control"
 msgstr "خدمات الشبكة تحت سيطرتك"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "تحميل ملفات ZIP متوقف"
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "الملفات بحاجة الى ان يتم تحميلها واحد تلو الاخر"
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "العودة الى الملفات"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "الملفات المحددة كبيرة جدا ليتم ضغطها في ملف zip"
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -277,19 +280,19 @@ msgstr "اعداد اسم مستخدم للمدير"
 msgid "Set an admin password."
 msgstr "اعداد كلمة مرور للمدير"
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>."
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s شارك »%s« معك"
@@ -331,73 +334,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "تعذر العثور على المجلد \"%s\""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 194e841cfd..6814322b03 100644
--- a/l10n/ar/settings.po
+++ b/l10n/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "وضعية الإرسال"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "التشفير"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "أسلوب التطابق"
 
@@ -101,6 +101,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "تم حفظ البريد الإلكتروني"
@@ -117,6 +127,16 @@ msgstr "فشل إزالة المجموعة"
 msgid "Unable to delete user"
 msgstr "فشل إزالة المستخدم"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "تم تغيير اللغة"
@@ -172,7 +192,7 @@ msgstr "Back-end لا يدعم تغيير كلمة المرور, لاكن مفت
 msgid "Unable to change password"
 msgstr "لا يمكن تغيير كلمة المرور"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "جاري الارسال ..."
 
@@ -228,34 +248,42 @@ msgstr "حدث"
 msgid "Updated"
 msgstr "تم التحديث بنجاح"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "اختر صورة الملف الشخصي "
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "كلمة السر ضعيفة جدا"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "كلمة السر ضعيفة"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "كلمة السر جيدة"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "كلمة السر قوية"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "تم الحذف"
@@ -301,7 +329,7 @@ msgstr "يجب ادخال كلمة مرور صحيحة"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "تحذير: المجلد الرئيسي لـ المستخدم \"{user}\" موجود مسبقا"
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -489,148 +517,143 @@ msgstr "السماح للتطبيقات بالمشاركة عن طريق الAPI
 msgid "Allow links"
 msgstr "السماح بالعناوين"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط "
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط "
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "السماح بإعادة المشاركة "
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "السماح للمستخدمين باعادة مشاركة الملفات التي تم مشاركتها معهم"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "السماح للمستعملين بإعادة المشاركة مع أي أحد  "
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "السماح للمستعمينٍ لإعادة المشاركة فقط مع المستعملين في مجموعاتهم"
+
 #: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
+msgstr "السماح بتنبيهات البريد الالكتروني."
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "حماية"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "فرض HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "اجبار العميل للاتصال بـ %s عن طريق اتصال مشفر"
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "خادم البريد الالكتروني"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "عنوان الخادم"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "المنفذ"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "سجل"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "مستوى السجل"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "المزيد"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "أقل"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "إصدار"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -783,29 +806,33 @@ msgstr "اللغة"
 msgid "Help translate"
 msgstr "ساعد في الترجمه"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "البرنامج المشفر لم يعد مفعل, يرجى فك التشفير عن كل ملفاتك"
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "كلمه سر الدخول"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "فك تشفير جميع الملفات "
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "اسم الدخول"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 78fa4f951e..4391286927 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -87,47 +87,47 @@ msgstr "نجاح"
 msgid "Error"
 msgstr "خطأ"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "إختر مجموعة"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -138,7 +138,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -149,11 +149,11 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/ast/core.po b/l10n/ast/core.po
index 5fb6629ee3..7f7b4ff260 100644
--- a/l10n/ast/core.po
+++ b/l10n/ast/core.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# dixebra <davidlopezcastanon@gmail.com>, 2014
+# Iñigo Varela <ivarela@softastur.org>, 2014
 # 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-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -59,229 +61,229 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Domingu"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Llunes"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Martes"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Xueves"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Vienres"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sábadu"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Xineru"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Febreru"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Marzu"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Abril"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mayu"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Xunu"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Xunetu"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Agostu"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Setiembre"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Ochobre"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Payares"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Avientu"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Axustes"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "fai segundos"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "fai %n minutu"
 msgstr[1] "fai %n minutos"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "fai %n hora"
 msgstr[1] "fai %n hores"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "güei"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "ayeri"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "fai %n día"
 msgstr[1] "fai %n díes"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "mes caberu"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "fai %n mes"
 msgstr[1] "fai %n meses"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "añu caberu"
 
-#: js/js.js:1255
+#: js/js.js:1249
 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
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Non"
 
-#: js/oc-dialogs.js:204
-msgid "Ok"
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Esbillar"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr "Aceutar"
+
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "¿Qué ficheros quies caltener?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Encaboxar"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Continuar"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
 #: js/setup.js:84
 msgid "Very weak password"
-msgstr ""
+msgstr "Contraseña mui feble"
 
 #: js/setup.js:85
 msgid "Weak password"
-msgstr ""
+msgstr "Contraseña feble"
 
 #: js/setup.js:86
 msgid "So-so password"
-msgstr ""
+msgstr "Contraseña pasable"
 
 #: js/setup.js:87
 msgid "Good password"
-msgstr ""
+msgstr "Contraseña bona"
 
 #: js/setup.js:88
 msgid "Strong password"
-msgstr ""
+msgstr "Contraseña mui bona"
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
@@ -291,30 +293,30 @@ msgstr "Compartíu"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Fallu"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
-msgstr ""
+msgstr "Fallu mientres la compartición"
 
 #: js/share.js:171
 msgid "Error while unsharing"
-msgstr ""
+msgstr "Fallu mientres se dexaba de compartir"
 
 #: js/share.js:178
 msgid "Error while changing permissions"
-msgstr ""
+msgstr "Fallu mientres camudaben los permisos"
 
 #: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Compartíu contigo y col grupu {group} por {owner}"
 
 #: js/share.js:190
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Compartíu contigo por {owner}"
 
 #: js/share.js:214
 msgid "Share with user or group …"
@@ -324,113 +326,122 @@ msgstr ""
 msgid "Share link"
 msgstr "Compartir enllaz"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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 ""
+msgstr "Protexer con contraseña"
 
 #: js/share.js:235
-msgid "Send"
-msgstr "Unviar"
-
-#: js/share.js:240
-msgid "Set expiration date"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr "Enlláz de corréu electrónicu a la persona"
+
+#: js/share.js:246
+msgid "Send"
+msgstr "Unviar"
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr "Afitar la data de caducidá"
+
+#: js/share.js:252
 msgid "Expiration date"
-msgstr ""
+msgstr "Data de caducidá"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
-msgstr ""
+msgstr "Compartir vía corréu electrónicu:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
-msgstr ""
+msgstr "Nun s'atoparon persones"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grupu"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Recompartir nun ta permitíu"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Compartíu en {item} con {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Dexar de compartir"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "notificar per corréu"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "pue editar"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "control d'accesu"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "xubir"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "desaniciar"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Contraseña protexida"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Fallu desafitando la data de caducidá"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
-msgstr ""
+msgstr "Fallu afitando la fecha de caducidá"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
-msgstr ""
+msgstr "Unviando ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Corréu unviáu"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Avisu"
 
 #: js/tags.js:4
 msgid "The object type is not specified."
-msgstr ""
+msgstr "El tipu d'oxetu nun ta especificáu."
 
 #: js/tags.js:13
 msgid "Enter new"
@@ -465,11 +476,11 @@ msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr ""
+msgstr "L'anovamientu fízose con ésitu. Por favor, informa d'esti problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comuña ownCloud</a>."
 
 #: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud."
 
 #: lostpassword/controller.php:70
 #, php-format
@@ -484,7 +495,7 @@ msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}"
 
 #: lostpassword/templates/lostpassword.php:7
 msgid ""
@@ -499,7 +510,7 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:18
 msgid "You will receive a link to reset your password via Email."
-msgstr ""
+msgstr "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña"
 
 #: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
 #: templates/login.php:32
@@ -524,19 +535,19 @@ msgstr "Reaniciar"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr ""
+msgstr "Restablecióse la contraseña"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "Aniciar sesión na páxina"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr ""
+msgstr "Contraseña nueva"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr ""
+msgstr "Restablecer contraseña"
 
 #: setup/controller.php:140
 #, php-format
@@ -560,15 +571,15 @@ msgstr "Usuarios"
 
 #: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
-msgstr ""
+msgstr "Aplicaciones"
 
 #: strings.php:8
 msgid "Admin"
-msgstr ""
+msgstr "Alministrador"
 
 #: strings.php:9
 msgid "Help"
-msgstr ""
+msgstr "Ayuda"
 
 #: tags/controller.php:22
 msgid "Error loading tags"
@@ -600,11 +611,11 @@ msgstr ""
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Accesu denegáu"
 
 #: templates/404.php:15
 msgid "Cloud not found"
-msgstr ""
+msgstr "Ñube non atopada"
 
 #: templates/altmail.php:2
 #, php-format
@@ -628,7 +639,7 @@ msgstr "¡Salú!"
 #: templates/installation.php:25 templates/installation.php:32
 #: templates/installation.php:39
 msgid "Security Warning"
-msgstr ""
+msgstr "Avisu de seguridá"
 
 #: templates/installation.php:26
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
@@ -643,19 +654,19 @@ msgstr ""
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Nun ta disponible'l xenerador de númberos al debalu, por favor activa la estensión PHP OpenSSL."
 
 #: templates/installation.php:34
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr ""
+msgstr "Ensin un xenerador de númberos al debalu, un atacante podría aldovinar los tokens pa restablecer la contraseña y tomar el control de la cuenta."
 
 #: templates/installation.php:40
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+msgstr "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula."
 
 #: templates/installation.php:42
 #, php-format
@@ -666,7 +677,11 @@ msgstr ""
 
 #: templates/installation.php:48
 msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "Crea una <strong>cuenta d'alministrador</strong>"
+
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Contraseña"
 
 #: templates/installation.php:70
 msgid "Storage & database"
@@ -674,11 +689,11 @@ msgstr ""
 
 #: templates/installation.php:77
 msgid "Data folder"
-msgstr ""
+msgstr "Carpeta de datos"
 
 #: templates/installation.php:90
 msgid "Configure the database"
-msgstr ""
+msgstr "Configura la base de datos"
 
 #: templates/installation.php:94
 msgid "will be used"
@@ -686,27 +701,27 @@ msgstr "usaráse"
 
 #: templates/installation.php:109
 msgid "Database user"
-msgstr ""
+msgstr "Usuariu de la base de datos"
 
 #: templates/installation.php:118
 msgid "Database password"
-msgstr ""
+msgstr "Contraseña de la base de datos"
 
 #: templates/installation.php:123
 msgid "Database name"
-msgstr ""
+msgstr "Nome de la base de datos"
 
 #: templates/installation.php:132
 msgid "Database tablespace"
-msgstr ""
+msgstr "Espaciu de tables de la base de datos"
 
 #: templates/installation.php:140
 msgid "Database host"
-msgstr ""
+msgstr "Agospiador de la base de datos"
 
 #: templates/installation.php:150
 msgid "Finish setup"
-msgstr ""
+msgstr "Finar la configuración "
 
 #: templates/installation.php:150
 msgid "Finishing …"
@@ -730,7 +745,7 @@ msgstr "Zarrar sesión"
 
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "¡Aniciu de sesión automáticu refugáu!"
 
 #: templates/login.php:10
 msgid ""
diff --git a/l10n/ast/files.po b/l10n/ast/files.po
index 6efeb14935..cb43b71c36 100644
--- a/l10n/ast/files.po
+++ b/l10n/ast/files.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# tebanpb <peruyero@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -20,14 +21,14 @@ msgstr ""
 #: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Nun pudo movese %s - Yá existe un ficheru con esi nome."
 
 #: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "Nun pudo movese %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "El nome de ficheru nun pue quedar baleru."
 
@@ -36,18 +37,18 @@ msgstr "El nome de ficheru nun pue quedar baleru."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 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:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -82,11 +83,11 @@ msgstr ""
 
 #: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Nun se puede afitar la carpeta de xubida."
 
 #: ajax/upload.php:33
 msgid "Invalid Token"
-msgstr ""
+msgstr "Token inválidu"
 
 #: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
@@ -99,7 +100,7 @@ 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 ""
+msgstr "El ficheru xubíu perpasa la direutiva \"upload_max_filesize\" del ficheru php.ini"
 
 #: ajax/upload.php:85
 msgid ""
@@ -129,273 +130,288 @@ msgstr "Nun hai abondu espaciu disponible"
 
 #: ajax/upload.php:169
 msgid "Upload failed. Could not find uploaded file"
-msgstr ""
+msgstr "Xubida fallía.  Nun se pudo atopar el ficheru xubíu."
 
 #: ajax/upload.php:179
 msgid "Upload failed. Could not get file info."
-msgstr ""
+msgstr "Falló la xubida.  Nun se pudo obtener la información del ficheru."
 
 #: ajax/upload.php:194
 msgid "Invalid directory."
-msgstr ""
+msgstr "Carpeta non válida."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Ficheros"
 
-#: js/file-upload.js:254
-msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+#: appinfo/app.php:29
+msgid "All files"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "Nun se pudo xubir {filename}, paez que ye un directoriu o tien 0 bytes"
+
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Xubida encaboxada."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
-msgstr ""
+msgstr "Nun se pudo obtener el resultáu del servidor."
 
 #: js/file-upload.js:490
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "La xubida del ficheru ta en progresu.  Si dexes esta páxina encaboxarase la xubida."
 
 #: js/file-upload.js:555
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} yá existe"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
-msgstr ""
+msgstr "Desaniciar dafechu"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Renomar"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr ""
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Ta preparándose la descarga.  Esto podría llevar dalgún tiempu si los ficheros son grandes."
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Fallu"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Fallu moviendo'l ficheru"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Fallu"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nome"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Tamañu"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Modificáu"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "L'almacenamientu ta completu, ¡yá nun se pueden anovar o sincronizar ficheros!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "L'almacenamientu ta casi completu ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
+msgstr "Deshabilitose'l cifráu pero los tos ficheros tovía tan cifraos.  Por favor, vete a los axustes personales pa descrifrar los tos ficheros."
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
-msgstr ""
-
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nome"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Tamañu"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "Nun se puede renomar %s "
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
 
 #: templates/admin.php:4
 msgid "File handling"
-msgstr ""
+msgstr "Alministración de ficheros"
 
 #: templates/admin.php:6
 msgid "Maximum upload size"
-msgstr ""
+msgstr "Tamañu máximu de xubida"
 
 #: templates/admin.php:9
 msgid "max. possible: "
-msgstr ""
+msgstr "máx. posible:"
 
 #: templates/admin.php:14
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Ye necesariu pa descargues multificheru y de carpetes"
 
 #: templates/admin.php:16
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Activar descarga ZIP"
 
 #: templates/admin.php:19
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 ye illimitao"
 
 #: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Tamañu máximu d'entrada pa ficheros ZIP"
 
 #: templates/admin.php:25
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:5
-msgid "New"
-msgstr ""
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: templates/index.php:8
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Usa esta direición pa <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a los ficheros a traviés de WebDAV</a>"
+
+#: templates/list.php:5
+msgid "New"
+msgstr "Nuevu"
+
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
-msgstr ""
+msgstr "Ficheru de testu"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Carpeta"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
-msgstr ""
+msgstr "Dende enllaz"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Encaboxar xuba"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
-msgstr ""
+msgstr "Nun hai nada equí. ¡Xubi daqué!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Desaniciar"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
-msgstr ""
+msgstr "La xubida ye demasiao grande"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "Los ficheros que tas intentando xubir perpasen el tamañu máximu pa les xubíes de ficheros nesti servidor."
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Tan escaniándose los ficheros, espera por favor."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
-msgstr ""
+msgstr "Escanéu actual"
diff --git a/l10n/ast/files_encryption.po b/l10n/ast/files_encryption.po
index 61be80edef..bfe3af1968 100644
--- a/l10n/ast/files_encryption.po
+++ b/l10n/ast/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+# 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"
+"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"PO-Revision-Date: 2014-05-18 10:22+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"
@@ -20,46 +21,46 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Habilitóse la recuperación de ficheros"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña."
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Clave de recuperación deshabilitada"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr "Contraseña camudada esitosamente."
+msgstr "Camudóse la contraseña"
 
 #: 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."
+msgstr "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta."
 
 #: ajax/updatePrivateKeyPassword.php:52
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Contraseña de clave privada anovada correchamente."
 
 #: ajax/updatePrivateKeyPassword.php:54
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Nun pudo camudase la contraseña. Pue que la contraseña antigua nun seya correuta."
 
 #: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu."
 
 #: files/error.php:16
 #, php-format
@@ -67,50 +68,50 @@ msgid ""
 "Your private key is not valid! Likely your password was changed outside of "
 "%s (e.g. your corporate directory). You can update your private key password"
 " in your personal settings to recover access to your encrypted files."
-msgstr ""
+msgstr "¡La clave privada nun ye válida! Seique la contraseña se camudase dende fuera de %s (Ex:El to direutoriu corporativu). Pues anovar la contraseña de la clave privada nes tos opciones personales pa recuperar l'accesu a los ficheros."
 
 #: files/error.php:19
 msgid ""
 "Can not decrypt this file, probably this is a shared file. Please ask the "
 "file owner to reshare the file with you."
-msgstr ""
+msgstr "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartíu. Solicita al propietariu del mesmu que vuelva a compartilu contigo."
 
 #: files/error.php:22 files/error.php:27
 msgid ""
 "Unknown error please check your system settings or contact your "
 "administrator"
-msgstr ""
+msgstr "Fallu desconocíu. Verifica la configuración del sistema o ponte en contautu col alministrador"
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
-msgstr ""
+msgstr "Requisitos incompletos."
 
 #: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
-msgstr ""
+msgstr "Por favor, asegúrate de que PHP 5.3.3 o postreru ta instaláu y que la estensión OpenSSL de PHP ta habilitada y configurada correutamente. Pel momentu, l'aplicación de cifráu deshabilitóse."
 
 #: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Los siguientes usuarios nun se configuraron pal cifráu:"
 
 #: js/detect-migration.js:21
 msgid "Initial encryption started... This can take some time. Please wait."
-msgstr ""
+msgstr "Cifráu aniciáu..... Esto pue llevar un tiempu. Por favor espera."
 
 #: js/detect-migration.js:25
 msgid "Initial encryption running... Please try again later."
-msgstr ""
+msgstr "Cifráu inicial en cursu... Inténtalo dempués."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "Dir direutamente a"
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
-msgstr "axustes personales"
+msgstr "opciones personales"
 
 #: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
@@ -119,19 +120,19 @@ msgstr "Cifráu"
 #: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
+msgstr "Habilitar la clave de recuperación (permite recuperar los ficheros del usuariu en casu de perda de la contraseña);"
 
 #: templates/settings-admin.php:9
 msgid "Recovery key password"
-msgstr ""
+msgstr "Contraseña de clave de recuperación"
 
 #: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Repeti la contraseña de clave de recuperación"
 
 #: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
-msgstr "Habilitáu"
+msgstr "Habilitar"
 
 #: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
@@ -139,64 +140,64 @@ msgstr "Deshabilitáu"
 
 #: templates/settings-admin.php:32
 msgid "Change recovery key password:"
-msgstr ""
+msgstr "Camudar la contraseña de la clave de recuperación"
 
 #: templates/settings-admin.php:38
 msgid "Old Recovery key password"
-msgstr ""
+msgstr "Clave de recuperación vieya"
 
 #: templates/settings-admin.php:45
 msgid "New Recovery key password"
-msgstr ""
+msgstr "Clave de recuperación nueva"
 
 #: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Repetir la clave de recuperación nueva"
 
 #: templates/settings-admin.php:56
 msgid "Change Password"
-msgstr "Camudar conseña"
+msgstr "Camudar contraseña"
 
 #: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "La to contraseña de clave privada yá nun concasa cola contraseña d'accesu:"
 
 #: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Afitar la contraseña de la to clave privada vieya a la to contraseña actual d'accesu."
 
 #: 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."
+msgstr "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros."
 
 #: templates/settings-personal.php:21
 msgid "Old log-in password"
-msgstr ""
+msgstr "Contraseña d'accesu vieya"
 
 #: templates/settings-personal.php:27
 msgid "Current log-in password"
-msgstr ""
+msgstr "Contraseña d'accesu actual"
 
 #: templates/settings-personal.php:32
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Anovar Contraseña de Clave Privada"
 
 #: templates/settings-personal.php:41
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "Habilitar la recuperación de contraseña:"
 
 #: 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 ""
+msgstr "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña"
 
 #: templates/settings-personal.php:59
 msgid "File recovery settings updated"
-msgstr ""
+msgstr "Opciones de recuperación de ficheros anovada"
 
 #: templates/settings-personal.php:60
 msgid "Could not update file recovery"
-msgstr "Nun pue anovase'l ficheru de recuperación"
+msgstr "Nun pudo anovase la recuperación de ficheros"
diff --git a/l10n/ast/files_external.po b/l10n/ast/files_external.po
index 761123b24d..00622dcf23 100644
--- a/l10n/ast/files_external.po
+++ b/l10n/ast/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 14:30+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"PO-Revision-Date: 2014-05-18 10:23+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"
@@ -17,62 +17,222 @@ msgstr ""
 "Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Llocal"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Llocalización"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Clave"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Secretu"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr "Depósitu"
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr "Amazon S3 y compatibilidá"
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "Clave d'accesu"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Clave Secreta"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "Nome d'equipu (opcional)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Puertu (opcional)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Rexón (opcional)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Habilitar SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr "Habilitar Estilu de ruta"
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "App principal"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr "App secreta"
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Sirvidor"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Nome d'usuariu"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Contraseña"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Raíz"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "Secure ftps://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "ID de veceru"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr "Veceru secretu"
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr "OpenStack Object Storage"
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Nome d'usuariu (necesariu)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr "Depósitu (necesariu)"
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr "Rexón (opcional pa OpenStack Object Storage)"
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr "Clave API (necesaria pa Rackspace Cloud Files)"
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr "Nome d'inquilín (necesariu pa OpenStack Object Storage)"
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr "Contraseña (necesaria pa OpenStack Object Storage)"
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr "Nome de Serviciu (necesariu pa OpenStack Object Storage)"
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)"
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr "Tiempu d'espera de peticiones HTTP en segundos (opcional)"
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Compartir"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr "SMB / CIFS usando accesu OC"
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr "Nome d'usuariu como Compartición"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "Secure https://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "Subcarpeta remota"
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
-msgstr ""
+msgstr "Accesu concedíu"
 
 #: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
-msgstr ""
+msgstr "Fallu configurando l'almacenamientu de Dropbox"
 
 #: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
-msgstr ""
+msgstr "Conceder accesu"
 
 #: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "Por favor, proporciona una clave válida de l'app Dropbox y una clave secreta."
 
 #: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "Fallu configurando l'almacenamientu de Google Drive"
 
 #: js/settings.js:318 js/settings.js:325
 msgid "Saved"
-msgstr ""
+msgstr "Guardáu"
 
-#: lib/config.php:598
+#: lib/config.php:589
 msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>Nota:</b> "
 
-#: lib/config.php:608
+#: lib/config.php:599
 msgid " and "
-msgstr ""
+msgstr "y"
 
-#: lib/config.php:630
+#: lib/config.php:621
 #, 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 ""
+msgstr "<b>Nota:</b> El soporte de cURL en PHP nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale."
 
-#: lib/config.php:632
+#: lib/config.php:623
 #, 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 ""
+msgstr "<b>Nota:</b> El soporte de FTP en PHP nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale."
 
-#: lib/config.php:634
+#: lib/config.php:625
 #, 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 ""
+msgstr "<b>Nota:</b> \"%s\" nun ta instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale."
 
 #: templates/settings.php:2
 msgid "External Storage"
-msgstr ""
+msgstr "Almacenamientu esternu"
 
 #: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
@@ -80,7 +240,7 @@ msgstr "Nome de la carpeta"
 
 #: templates/settings.php:9
 msgid "External storage"
-msgstr ""
+msgstr "Almacenamientu esternu"
 
 #: templates/settings.php:10
 msgid "Configuration"
@@ -92,19 +252,19 @@ msgstr "Opciones"
 
 #: templates/settings.php:12
 msgid "Available for"
-msgstr ""
+msgstr "Disponible pa"
 
 #: templates/settings.php:32
 msgid "Add storage"
-msgstr ""
+msgstr "Amestar almacenamientu"
 
 #: templates/settings.php:92
 msgid "No user or group"
-msgstr ""
+msgstr "Nengún usuariu o grupu"
 
 #: templates/settings.php:95
 msgid "All Users"
-msgstr ""
+msgstr "Tolos usuarios"
 
 #: templates/settings.php:97
 msgid "Groups"
@@ -121,16 +281,16 @@ msgstr "Desaniciar"
 
 #: templates/settings.php:132
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Habilitar almacenamientu esterno d'usuariu"
 
 #: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Permitir a los usuarios montar el siguiente almacenamientu esternu"
 
 #: templates/settings.php:150
 msgid "SSL root certificates"
-msgstr ""
+msgstr "Certificaos raíz SSL"
 
 #: templates/settings.php:168
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Importar certificáu raíz"
diff --git a/l10n/ast/files_sharing.po b/l10n/ast/files_sharing.po
index 9154e9f56e..b57be381bc 100644
--- a/l10n/ast/files_sharing.po
+++ b/l10n/ast/files_sharing.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# dixebra <davidlopezcastanon@gmail.com>, 2014
+# 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 20:00+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -23,11 +25,11 @@ msgstr "Compartíu por {owner}"
 
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
-msgstr ""
+msgstr "Esta compartición tien contraseña protexida"
 
 #: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "La contraseña ye incorreuta. Inténtalo otra vegada."
 
 #: templates/authenticate.php:10
 msgid "Password"
@@ -35,38 +37,37 @@ msgstr "Contraseña"
 
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "Sentímoslo, esti enllaz paez que yá nun furrula."
 
 #: templates/part.404.php:4
 msgid "Reasons might be:"
-msgstr ""
+msgstr "Les razones pueden ser: "
 
 #: templates/part.404.php:6
 msgid "the item was removed"
-msgstr ""
+msgstr "desanicióse l'elementu"
 
 #: templates/part.404.php:7
 msgid "the link expired"
-msgstr ""
+msgstr "l'enllaz caducó"
 
 #: templates/part.404.php:8
 msgid "sharing is disabled"
-msgstr ""
+msgstr "compartir ta desactiváu"
 
 #: templates/part.404.php:10
 msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "Pa más información, entrúga-y a la persona qu'unvió esti enllaz"
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr ""
+#: templates/public.php:21
+msgid "Download"
+msgstr "Baxar"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
-msgstr ""
+msgstr "Descargar %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
-msgstr ""
+msgstr "Enllaz direutu"
diff --git a/l10n/ast/files_trashbin.po b/l10n/ast/files_trashbin.po
index 5e51f4759a..4d8d8436ff 100644
--- a/l10n/ast/files_trashbin.po
+++ b/l10n/ast/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-22 01:54-0400\n"
-"PO-Revision-Date: 2014-04-21 16:38+0000\n"
-"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Nun pudo desaniciase %s dafechu"
 msgid "Couldn't restore %s"
 msgstr "Nun pudo restaurase %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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 "Ficheros desaniciaos"
 
-#: lib/trashbin.php:861 lib/trashbin.php:863
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Nun hai un res equí. La papelera ta balera!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nome"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Restaurar"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Fallu"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "recuperóse"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Nun hai un res equí. La papelera ta balera!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nome"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Desaniciáu"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Desaniciar"
diff --git a/l10n/ast/lib.po b/l10n/ast/lib.po
index cfd280ca4b..b360b54e39 100644
--- a/l10n/ast/lib.po
+++ b/l10n/ast/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -18,12 +18,15 @@ msgstr ""
 "Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -39,7 +42,7 @@ msgstr ""
 
 #: private/app.php:353
 msgid "Help"
-msgstr ""
+msgstr "Ayuda"
 
 #: private/app.php:366
 msgid "Personal"
@@ -74,23 +77,23 @@ msgstr "Imaxe inválida"
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -158,7 +161,7 @@ msgstr "L'aplicación nun ta habilitada"
 
 #: private/json.php:40 private/json.php:62 private/json.php:87
 msgid "Authentication error"
-msgstr ""
+msgstr "Fallu d'autenticación"
 
 #: private/json.php:51
 msgid "Token expired. Please reload page."
@@ -276,19 +279,19 @@ msgstr "Afitar nome d'usuariu p'almin"
 msgid "Set an admin password."
 msgstr "Afitar contraseña p'almin"
 
-#: private/setup.php:202
+#: private/setup.php:164
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "El sirvidor web entá nun ta configurado pa permitir la sincronización de ficheros yá que la interface WebDAV paez nun tar funcionando."
 
-#: private/setup.php:203
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -330,73 +333,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Nun pudo alcontrase la estaya \"%s.\""
@@ -457,11 +466,11 @@ msgstr ""
 
 #: private/user/manager.php:237
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Tien d'apurrise un nome d'usuariu válidu"
 
 #: private/user/manager.php:241
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Tien d'apurrise una contraseña válida"
 
 #: private/user/manager.php:246
 msgid "The username is already being used"
diff --git a/l10n/ast/settings.po b/l10n/ast/settings.po
index d6f97da135..d9a6de6bef 100644
--- a/l10n/ast/settings.po
+++ b/l10n/ast/settings.po
@@ -3,12 +3,13 @@
 # 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-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -20,198 +21,218 @@ msgstr ""
 #: admin/controller.php:66
 #, php-format
 msgid "Invalid value supplied for %s"
-msgstr ""
+msgstr "Introdúxose un valor non válidu pa %s"
 
 #: admin/controller.php:73
 msgid "Saved"
-msgstr ""
+msgstr "Guardáu"
 
 #: admin/controller.php:90
 msgid "test email settings"
-msgstr ""
+msgstr "probar configuración de corréu"
 
 #: admin/controller.php:91
 msgid "If you received this email, the settings seem to be correct."
-msgstr ""
+msgstr "Si recibisti esti mensaxe de corréu-e, la to configuración ta correuta."
 
 #: admin/controller.php:94
 msgid ""
 "A problem occurred while sending the e-mail. Please revisit your settings."
-msgstr ""
+msgstr "Hebo un problema al unviar el mensaxe. Revisa la configuración."
 
 #: admin/controller.php:99
 msgid "Email sent"
-msgstr "Corréu unviáu"
+msgstr "Corréu-e unviáu"
 
 #: admin/controller.php:101
 msgid "You need to set your user email before being able to send test emails."
-msgstr ""
+msgstr "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba."
 
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
-msgstr ""
+msgstr "Mou d'unviu"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Cifráu"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
-msgstr ""
+msgstr "Métodu d'autenticación"
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Nun pudo cargase la llista dende'l App Store"
 
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20 changepassword/controller.php:49
 msgid "Authentication error"
-msgstr ""
+msgstr "Fallu d'autenticación"
 
 #: ajax/changedisplayname.php:31
 msgid "Your full name has been changed."
-msgstr ""
+msgstr "Camudóse'l nome completu."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change full name"
-msgstr ""
+msgstr "Nun pue camudase'l nome completu"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
-msgstr ""
+msgstr "El grupu yá esiste"
 
 #: ajax/creategroup.php:19
 msgid "Unable to add group"
-msgstr ""
+msgstr "Nun pudo amestase'l grupu"
 
 #: ajax/decryptall.php:31
 msgid "Files decrypted successfully"
-msgstr ""
+msgstr "Descifráronse los ficheros"
 
 #: ajax/decryptall.php:33
 msgid ""
 "Couldn't decrypt your files, please check your owncloud.log or ask your "
 "administrator"
-msgstr ""
+msgstr "Nun pudieron descifrase sus ficheros. Revisa'l owncloud.log o consulta col alministrador"
 
 #: ajax/decryptall.php:36
 msgid "Couldn't decrypt your files, check your password and try again"
+msgstr "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtalo dempués"
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
 msgstr ""
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
-msgstr ""
+msgstr "Corréu-e guardáu"
 
 #: ajax/lostpassword.php:14
 msgid "Invalid email"
-msgstr ""
+msgstr "Corréu electrónicu non válidu"
 
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Nun pudo desaniciase'l grupu"
 
 #: ajax/removeuser.php:25
 msgid "Unable to delete user"
+msgstr "Nun pudo desaniciase l'usuariu"
+
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
 msgstr ""
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
-msgstr ""
+msgstr "Camudóse la llingua"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "Solicitú non válida"
+msgstr "Solicitú inválida"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Los alministradores nun puen desaniciase a ellos mesmos del grupu d'alministrador"
 
 #: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Nun pudo amestase l'usuariu al grupu %s"
 
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Nun pudo desaniciase al usuariu del grupu %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "Nun pudo anovase l'aplicación."
 
 #: changepassword/controller.php:17
 msgid "Wrong password"
-msgstr ""
+msgstr "Contraseña incorreuta"
 
 #: changepassword/controller.php:36
 msgid "No user supplied"
-msgstr ""
+msgstr "Nun s'especificó un usuariu"
 
 #: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
-msgstr ""
+msgstr "Facilita una contraseña de recuperación d'alministrador, sinón podríen perdese tolos datos d'usuariu"
 
 #: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
-msgstr ""
+msgstr "Contraseña de recuperación d'alministrador incorreuta. Comprueba la contraseña ya inténtalo dempués."
 
 #: changepassword/controller.php:81
 msgid ""
 "Back-end doesn't support password change, but the users encryption key was "
 "successfully updated."
-msgstr ""
+msgstr "El back-end nun sofita cambeos de contraseña, pero la contraseña de cifráu del usuariu anovóse afechiscamente."
 
 #: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
-msgstr ""
+msgstr "Nun pudo camudase la contraseña"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
-msgstr ""
+msgstr "Unviando..."
 
 #: js/apps.js:45 templates/help.php:4
 msgid "User Documentation"
-msgstr ""
+msgstr "Documentación d'usuariu"
 
 #: js/apps.js:50
 msgid "Admin Documentation"
-msgstr ""
+msgstr "Documentación p'alministradores"
 
 #: js/apps.js:67
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "Anovar a {appversion}"
 
 #: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
-msgstr ""
+msgstr "Desactivar"
 
 #: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
-msgstr ""
+msgstr "Activar"
 
 #: js/apps.js:95
 msgid "Please wait...."
-msgstr ""
+msgstr "Espera, por favor...."
 
 #: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Fallu mientres se desactivaba l'aplicación"
 
 #: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Fallu mientres s'activaba l'aplicación"
 
 #: js/apps.js:149
 msgid "Updating...."
-msgstr ""
+msgstr "Anovando...."
 
 #: js/apps.js:152
 msgid "Error while updating app"
-msgstr ""
+msgstr "Fallu mientres s'anovaba l'aplicación"
 
 #: js/apps.js:152
 msgid "Error"
@@ -219,38 +240,46 @@ msgstr "Fallu"
 
 #: js/apps.js:153 templates/apps.php:55
 msgid "Update"
-msgstr ""
+msgstr "Anovar"
 
 #: js/apps.js:156
 msgid "Updated"
-msgstr ""
+msgstr "Anováu"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
-msgstr ""
+msgstr "Esbillar una imaxe de perfil"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
-msgstr ""
+msgstr "Contraseña mui feble"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
-msgstr ""
+msgstr "Contraseña feble"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
-msgstr ""
+msgstr "Contraseña pasable"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
-msgstr ""
+msgstr "Contraseña bona"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
+msgstr "Contraseña mui bona"
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu."
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
 msgstr ""
 
-#: js/personal.js:313
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:338
+msgid "Restore encryption keys."
 msgstr ""
 
 #: js/users.js:47
@@ -259,11 +288,11 @@ msgstr "desaniciáu"
 
 #: js/users.js:47
 msgid "undo"
-msgstr ""
+msgstr "desfacer"
 
 #: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Imposible desaniciar al usuariu"
 
 #: js/users.js:101 templates/users.php:24 templates/users.php:88
 #: templates/users.php:116
@@ -272,7 +301,7 @@ msgstr "Grupos"
 
 #: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
-msgstr ""
+msgstr "Alministrador del Grupu"
 
 #: js/users.js:127 templates/users.php:168
 msgid "Delete"
@@ -280,82 +309,82 @@ msgstr "Desaniciar"
 
 #: js/users.js:310
 msgid "add group"
-msgstr ""
+msgstr "amestar Grupu"
 
 #: js/users.js:486
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Tien d'apurrise un nome d'usuariu válidu"
 
 #: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
-msgstr ""
+msgstr "Fallu al crear usuariu"
 
 #: js/users.js:492
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Tien d'apurrise una contraseña válida"
 
 #: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
-msgstr ""
+msgstr "Avisu: el direutoriu d'aniciu pal usuariu \"{user}\" yá esiste."
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
-msgstr ""
+msgstr "Asturianu"
 
 #: templates/admin.php:8
 msgid "Everything (fatal issues, errors, warnings, info, debug)"
-msgstr ""
+msgstr "Too (Información, Avisos, Fallos, debug y problemes fatales)"
 
 #: templates/admin.php:9
 msgid "Info, warnings, errors and fatal issues"
-msgstr ""
+msgstr "Información, Avisos, Fallos y problemes fatales"
 
 #: templates/admin.php:10
 msgid "Warnings, errors and fatal issues"
-msgstr ""
+msgstr "Avisos, fallos y problemes fatales"
 
 #: templates/admin.php:11
 msgid "Errors and fatal issues"
-msgstr ""
+msgstr "Fallos y problemes fatales"
 
 #: templates/admin.php:12
 msgid "Fatal issues only"
-msgstr ""
+msgstr "Namái problemes fatales"
 
 #: templates/admin.php:16 templates/admin.php:23
 msgid "None"
-msgstr ""
+msgstr "Dengún"
 
 #: templates/admin.php:17
 msgid "Login"
-msgstr ""
+msgstr "Entamar sesión"
 
 #: templates/admin.php:18
 msgid "Plain"
-msgstr ""
+msgstr "Planu"
 
 #: templates/admin.php:19
 msgid "NT LAN Manager"
-msgstr ""
+msgstr "Xestor de NT LAN"
 
 #: templates/admin.php:24
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: templates/admin.php:25
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
 #: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
-msgstr ""
+msgstr "Avisu de seguridá"
 
 #: 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 "Tas ingresando a %s vía HTTP. Encamentámoste que configures el sirvidor pa solicitar HTTPS."
 
 #: templates/admin.php:64
 msgid ""
@@ -364,68 +393,68 @@ 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 ""
+msgstr "El direutoriu de datos y ficheros ye dablemente accesible dende Internet, darréu que'l ficheru .htaccess nun ta funcionando. Suxerímoste que configures el sirvidor web de mou que'l direutoriu de datos nun seya accesible o que muevas talu direutoriu fuera del raigañu de documentos del sirvidor web."
 
 #: templates/admin.php:75
 msgid "Setup Warning"
-msgstr ""
+msgstr "Avisu de configuración"
 
 #: 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 ""
+msgstr "El sirvidor web entá nun ta configurado pa permitir la sincronización de ficheros yá que la interface WebDAV paez nun tar funcionando."
 
 #: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Por favor, vuelvi a comprobar les <a href=\"%s\">guíes de instalación</a>."
 
 #: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Nun s'atopó'l módulu \"fileinfo\""
 
 #: templates/admin.php:93
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
-msgstr ""
+msgstr "Nun s'atopó'l módulu PHP 'fileinfo'. Encamentámoste qu'habilites esti módulu pa obtener meyores resultaos cola deteición de tribes MIME."
 
 #: templates/admin.php:104
 msgid "Your PHP version is outdated"
-msgstr ""
+msgstr "La versión de PHP nun ta anovada"
 
 #: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
-msgstr ""
+msgstr "La versión de PHP caducó. Suxerímose que l'anueves a 5.3.8 o a una más nueva porque davezu, les versiones vieyes nun funcionen bien. Puede ser qu'esta instalación nun tea funcionando bien."
 
 #: templates/admin.php:118
 msgid "Locale not working"
-msgstr ""
+msgstr "La configuración rexonal nun ta funcionando"
 
 #: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
-msgstr ""
+msgstr "Nun se pue escoyer una configuración rexonal que sofite UTF-8."
 
 #: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
-msgstr ""
+msgstr "Esto significa que pue haber problemes con ciertos caráuteres nos nomes de los ficheros."
 
 #: 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 "Ye enforma recomendable instalar los paquetes necesarios pa poder soportar una de les siguientes configuraciones rexonales: %s. "
 
 #: templates/admin.php:143
 msgid "Internet connection not working"
-msgstr ""
+msgstr "La conexón a Internet nun ta funcionando"
 
 #: templates/admin.php:146
 msgid ""
@@ -434,200 +463,195 @@ msgid ""
 "installation of 3rd party apps don´t work. Accessing files from remote and "
 "sending of notification emails might also not work. We suggest to enable "
 "internet connection for this server if you want to have all features."
-msgstr ""
+msgstr "Esti sirvidor nun tien conexón a Internet. Esto significa que dalgunes de les carauterístiques nun van funcionar, como'l montaxe d'almacenamiento esternu, les notificaciones sobre anovamientos, la instalación d'aplicaciones de terceros, l'accesu a los ficheros de mou remotu o l'unviu de correos-e de notificación. Suxerimos habilitar una conexón a Internet nesti sirvidor pa esfrutar de toles funciones."
 
 #: templates/admin.php:160
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:167
 #, php-format
 msgid "Last cron was executed at %s."
-msgstr ""
+msgstr "Cron executóse per cabera vegada a les %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 ""
+msgstr "Cron executóse per cabera vegada a les %s. Esto foi hai más d'una hora, daqué anda mal."
 
 #: templates/admin.php:174
 msgid "Cron was not executed yet!"
-msgstr ""
+msgstr "¡Cron entá nun s'executó!"
 
 #: templates/admin.php:184
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Executar una xera con cada páxina cargada"
 
 #: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
-msgstr ""
+msgstr "cron.php rexístrase nun serviciu webcron pa llamar a cron.php cada 15 minutos al traviés de HTTP."
 
 #: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
-msgstr ""
+msgstr "Usa'l serviciu cron del sistema pa llamar al ficheru cron.php cada 15 minutos."
 
 #: templates/admin.php:205
 msgid "Sharing"
-msgstr ""
+msgstr "Compartiendo"
 
 #: templates/admin.php:211
 msgid "Enable Share API"
-msgstr ""
+msgstr "Activar API de Compartición"
 
 #: templates/admin.php:212
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Permitir a les aplicaciones usar la API de Compartición"
 
 #: templates/admin.php:219
 msgid "Allow links"
+msgstr "Permitir enllaces"
+
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
-msgstr ""
+msgstr "Permitir xubes públiques"
 
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+#: templates/admin.php:230
+msgid "Set default expiration date"
+msgstr "Afitar la data d'espiración predeterminada"
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr "Caduca dempués de"
 
 #: templates/admin.php:235
+msgid "days"
+msgstr "díes"
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr "Facer cumplir la data de caducidá"
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Permitir a los usuarios compartir elementos col públicu per aciu d'enllaces"
+
+#: templates/admin.php:252
 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 ""
+msgstr "Permitir re-compartición"
 
 #: templates/admin.php:253
-msgid "Allow mail notification"
-msgstr ""
+msgid "Allow users to share items shared with them again"
+msgstr "Permitir a los usuarios compartir de nuevu elementos ya compartíos"
 
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Permitir a los usuarios compartir con cualesquier persona"
 
 #: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
+msgid "Allow users to only share with users in their groups"
+msgstr "Permitir a los usuarios compartir namái colos usuarios nos sos grupos"
 
 #: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
+msgid "Allow mail notification"
+msgstr "Permitir notificaciones per corréu-e"
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartíos"
+
+#: templates/admin.php:279
 msgid "Security"
-msgstr ""
+msgstr "Seguridá"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Forciar HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "Forciar a los veceros a coneutase a %s per duana d'una conexón cifrada."
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
-msgstr ""
+msgstr "Por favor, conéutate a %s al traviés de HTTPS p'habilitar o deshabilitar l'aplicación de SSL."
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
-msgstr ""
+msgstr "Sirvidor de corréu-e"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
-msgstr ""
+msgstr "Esto úsase pa unviar notificaciones."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
-msgstr ""
+msgstr "Dende la direición"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
-msgstr ""
+msgstr "Necesítase autenticación"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
-msgstr ""
+msgstr "Direición del sirvidor"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Puertu"
 
-#: templates/admin.php:379
-msgid "Credentials"
-msgstr ""
-
 #: templates/admin.php:380
+msgid "Credentials"
+msgstr "Credenciales"
+
+#: templates/admin.php:381
 msgid "SMTP Username"
-msgstr ""
+msgstr "Nome d'usuariu SMTP"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
-msgstr ""
-
-#: templates/admin.php:387
-msgid "Test email settings"
-msgstr ""
+msgstr "Contraseña SMTP"
 
 #: templates/admin.php:388
-msgid "Send email"
-msgstr ""
+msgid "Test email settings"
+msgstr "Probar configuración de corréu electrónicu"
 
-#: templates/admin.php:393
-msgid "Log"
-msgstr ""
+#: templates/admin.php:389
+msgid "Send email"
+msgstr "Unviar mensaxe"
 
 #: templates/admin.php:394
-msgid "Log level"
-msgstr ""
+msgid "Log"
+msgstr "Rexistru"
 
-#: templates/admin.php:426
+#: templates/admin.php:395
+msgid "Log level"
+msgstr "Nivel de rexistru"
+
+#: templates/admin.php:427
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
-msgstr ""
+msgstr "Versión"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -635,68 +659,68 @@ msgid ""
 "licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
 "target=\"_blank\"><abbr title=\"Affero General Public "
 "License\">AGPL</abbr></a>."
-msgstr ""
+msgstr "Desendolcáu pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">códigu fonte</a> ta baxo llicencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:14
 msgid "Add your App"
-msgstr ""
+msgstr "Amiesta la to aplicación"
 
 #: templates/apps.php:31
 msgid "More Apps"
-msgstr ""
+msgstr "Más aplicaciones"
 
 #: templates/apps.php:38
 msgid "Select an App"
-msgstr ""
+msgstr "Esbillar una aplicación"
 
 #: templates/apps.php:43
 msgid "Documentation:"
-msgstr ""
+msgstr "Documentación:"
 
 #: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Ver la páxina d'aplicaciones en apps.owncloud.com"
 
 #: templates/apps.php:51
 msgid "See application website"
-msgstr ""
+msgstr "Ver sitiu web de l'aplicación"
 
 #: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-llicencia otorgada por <span class=\"author\"></span>"
 
 #: templates/help.php:6
 msgid "Administrator Documentation"
-msgstr ""
+msgstr "Documentación d'alministrador"
 
 #: templates/help.php:9
 msgid "Online Documentation"
-msgstr ""
+msgstr "Documentación en llinia"
 
 #: templates/help.php:11
 msgid "Forum"
-msgstr ""
+msgstr "Foru"
 
 #: templates/help.php:14
 msgid "Bugtracker"
-msgstr ""
+msgstr "Rastrexador de fallos"
 
 #: templates/help.php:17
 msgid "Commercial Support"
-msgstr ""
+msgstr "Sofitu comercial"
 
 #: templates/personal.php:8
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Obtener les aplicaciones pa sincronizar ficheros"
 
 #: templates/personal.php:19
 msgid "Show First Run Wizard again"
-msgstr ""
+msgstr "Amosar nuevamente l'Encontu d'execución inicial"
 
 #: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+msgstr "Usasti <strong>%s</strong> de los <strong>%s</strong> disponibles"
 
 #: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
@@ -704,27 +728,27 @@ msgstr "Contraseña"
 
 #: templates/personal.php:39
 msgid "Your password was changed"
-msgstr ""
+msgstr "Camudóse la contraseña"
 
 #: templates/personal.php:40
 msgid "Unable to change your password"
-msgstr ""
+msgstr "Nun pudo camudase la contraseña"
 
 #: templates/personal.php:42
 msgid "Current password"
-msgstr ""
+msgstr "Contraseña actual"
 
 #: templates/personal.php:45
 msgid "New password"
-msgstr ""
+msgstr "Contraseña nueva"
 
 #: templates/personal.php:49
 msgid "Change password"
-msgstr ""
+msgstr "Camudar contraseña"
 
 #: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
-msgstr ""
+msgstr "Nome completu"
 
 #: templates/personal.php:76
 msgid "Email"
@@ -732,37 +756,37 @@ msgstr "Corréu-e"
 
 #: templates/personal.php:78
 msgid "Your email address"
-msgstr ""
+msgstr "Direición de corréu-e"
 
 #: templates/personal.php:81
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
-msgstr ""
+msgstr "Introducir una direición de corréu-e p'activar la recuperación de contraseñes y recibir notificaciones"
 
 #: templates/personal.php:89
 msgid "Profile picture"
-msgstr ""
+msgstr "Semeya de perfil"
 
 #: templates/personal.php:94
 msgid "Upload new"
-msgstr ""
+msgstr "Xubir otra"
 
 #: templates/personal.php:96
 msgid "Select new from Files"
-msgstr ""
+msgstr "Esbillar otra dende Ficheros"
 
 #: templates/personal.php:97
 msgid "Remove image"
-msgstr ""
+msgstr "Desaniciar imaxe"
 
 #: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Ficheru PNG o JPG. Preferiblemente cuadráu, pero vas poder retayalu."
 
 #: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
-msgstr ""
+msgstr "L'avatar ta proporcionáu pola to cuenta orixinal."
 
 #: templates/personal.php:104
 msgid "Cancel"
@@ -770,42 +794,46 @@ msgstr "Encaboxar"
 
 #: templates/personal.php:105
 msgid "Choose as profile image"
-msgstr ""
+msgstr "Esbillar como imaxe de perfil"
 
 #: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
-msgstr ""
+msgstr "Llingua"
 
 #: templates/personal.php:131
 msgid "Help translate"
-msgstr ""
+msgstr "Ayúdanos nes traducciones"
 
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
-msgstr ""
+msgstr "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros"
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
+msgstr "Contraseña d'accesu"
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr "Descifrar ficheros"
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
 msgstr ""
 
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
 msgstr ""
 
 #: templates/users.php:19
 msgid "Login Name"
-msgstr ""
+msgstr "Nome d'usuariu"
 
 #: templates/users.php:28
 msgid "Create"
@@ -813,25 +841,25 @@ msgstr "Crear"
 
 #: templates/users.php:34
 msgid "Admin Recovery Password"
-msgstr ""
+msgstr "Recuperación de la contraseña d'alministración"
 
 #: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "Introduz la contraseña de recuperación col envís de recuperar los ficheros de los usuarios mientres el cambéu de contraseña."
 
 #: templates/users.php:40
 msgid "Default Storage"
-msgstr ""
+msgstr "Almacenamientu predetermináu"
 
 #: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
-msgstr ""
+msgstr "Por favor indica la cuota d'almacenamientu (ex: \"512 MB\" o \"12 GB\")"
 
 #: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
-msgstr ""
+msgstr "Non llendáu"
 
 #: templates/users.php:64 templates/users.php:161
 msgid "Other"
@@ -843,16 +871,16 @@ msgstr "Nome d'usuariu"
 
 #: templates/users.php:92
 msgid "Storage"
-msgstr ""
+msgstr "Almacenamientu"
 
 #: templates/users.php:106
 msgid "change full name"
-msgstr ""
+msgstr "camudar el nome completu"
 
 #: templates/users.php:110
 msgid "set new password"
-msgstr ""
+msgstr "afitar nueva contraseña"
 
 #: templates/users.php:141
 msgid "Default"
-msgstr ""
+msgstr "Predetermináu"
diff --git a/l10n/ast/user_ldap.po b/l10n/ast/user_ldap.po
index 9b6520840c..6d546dd462 100644
--- a/l10n/ast/user_ldap.po
+++ b/l10n/ast/user_ldap.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# dixebra <davidlopezcastanon@gmail.com>, 2014
 # Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+# tebanpb <peruyero@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-22 01:54-0400\n"
-"PO-Revision-Date: 2014-04-21 17:44+0000\n"
-"Last-Translator: Tornes Llume <l.lumex03.tornes@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: dixebra <davidlopezcastanon@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"
@@ -24,17 +26,17 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Fallu al desaniciar la configuración del sevidor"
 
 #: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "¡La configuración ye válida y pudo afitase la conexón!"
 
 #: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "La configuración ye válida, pero falló'l vínculu.  Por favor, comprueba la configuración y les credenciales nel servidor."
 
 #: ajax/testConfiguration.php:46
 msgid ""
@@ -87,65 +89,65 @@ msgstr "Con ésitu"
 msgid "Error"
 msgstr "Fallu"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Configuración incorreuta"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Configuración incompleta"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Esbillar grupos"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Esbillar atributos"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "Test de conexón esitosu"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
-msgstr ""
+msgstr "Falló'l test de conexón"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s grupu alcontráu"
 msgstr[1] "%s grupos alcontraos"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s usuariu alcontráu"
 msgstr[1] "%s usuarios alcontraos"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Nun pudo alcontrase la carauterística deseyada"
 
@@ -159,7 +161,7 @@ msgstr ""
 
 #: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
 msgid "Help"
-msgstr ""
+msgstr "Ayuda"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
diff --git a/l10n/az/core.po b/l10n/az/core.po
index f61bb1c4aa..032123a18f 100644
--- a/l10n/az/core.po
+++ b/l10n/az/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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/az/files.po b/l10n/az/files.po
index 893a901dfd..ba2ff89dc1 100644
--- a/l10n/az/files.po
+++ b/l10n/az/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/az/files_external.po b/l10n/az/files_external.po
index 444bc71d9e..fce6118097 100644
--- a/l10n/az/files_external.po
+++ b/l10n/az/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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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"
@@ -17,6 +17,166 @@ msgstr ""
 "Language: az\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/az/files_sharing.po b/l10n/az/files_sharing.po
index 4f0393ce9e..ec76b28b23 100644
--- a/l10n/az/files_sharing.po
+++ b/l10n/az/files_sharing.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-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-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/az/files_trashbin.po b/l10n/az/files_trashbin.po
index ebef2b8141..7096af748a 100644
--- a/l10n/az/files_trashbin.po
+++ b/l10n/az/files_trashbin.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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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/delete.php:59
 #, php-format
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/az/lib.po b/l10n/az/lib.po
index d41bf8bc5a..086723a0df 100644
--- a/l10n/az/lib.po
+++ b/l10n/az/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -17,12 +17,15 @@ msgstr ""
 "Language: az\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/az/settings.po b/l10n/az/settings.po
index cd3448207b..cc0c4b1fa2 100644
--- a/l10n/az/settings.po
+++ b/l10n/az/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/be/core.po b/l10n/be/core.po
index 7b3d997c5f..edb373d577 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -59,95 +59,95 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Нядзеля"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Панядзелак"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Аўторак"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Серада"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Чацвер"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Пятніца"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Субота"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Студзень"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Люты"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Сакавік"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Красавік"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Май"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Чэрвень"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Ліпень"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Жнівень"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Верасень"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Кастрычнік"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Лістапад"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Снежань"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Налады"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "Секунд таму"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -155,7 +155,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -163,15 +163,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "Сёння"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "Ўчора"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -179,11 +179,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "У мінулым месяцы"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -191,39 +191,39 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "У мінулым годзе"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "Гадоў таму"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Выбар"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Так"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Не"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Выбар"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Добра"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
@@ -231,45 +231,45 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -301,12 +301,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Памылка"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -334,107 +334,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -678,6 +687,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/be/files.po b/l10n/be/files.po
index 46d6939add..8e52ee7fd2 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,55 +177,77 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Памылка"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Памылка"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
@@ -229,7 +255,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -237,11 +263,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -249,61 +271,47 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -340,68 +348,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/be/files_external.po b/l10n/be/files_external.po
index 3df60f9dbb..9ced33c56b 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,166 @@ 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"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/be/files_sharing.po b/l10n/be/files_sharing.po
index fe99759a49..6816667bff 100644
--- a/l10n/be/files_sharing.po
+++ b/l10n/be/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/be/files_trashbin.po b/l10n/be/files_trashbin.po
index 4ec9ee447f..a2a6246129 100644
--- a/l10n/be/files_trashbin.po
+++ b/l10n/be/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr ""
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Памылка"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index 52a04981ca..9ab5657053 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ 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"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 8e0a3d7a13..87ffaa5bb6 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 9dd5f13ded..848d98bda8 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -59,207 +59,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Неделя"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Понеделник"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Сряда"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Четвъртък"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Петък"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Събота"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Януари"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Февруари"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Март"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Април"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Май"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Юни"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Юли"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Август"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Септември"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Октомври"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Ноември"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Декември"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Записване..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "преди секунди"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "днес"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "последният месец"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "последната година"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "последните години"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Избери"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Да"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Не"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Избери"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Добре"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Отказ"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,12 +291,12 @@ msgstr "Споделено"
 msgid "Share"
 msgstr "Споделяне"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Грешка"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Грешка при споделяне"
 
@@ -324,107 +324,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Защитено с парола"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Парола"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Изпрати връзка до пощата на някои"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Изпрати"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Посочи дата на изтичане"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Дата на изтичане"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "сподели по поща:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Не са открити хора"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "група"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Допълнително споделяне не е разрешено"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Споделено в {item} с {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Премахни споделяне"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "може да променя"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "контрол на достъпа"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "създаване"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "Обновяване"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "Изтриване"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "Споделяне"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Защитено с парола"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Грешка при премахване на дата за изтичане"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Грепка при поставяне на дата за изтичане"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Изпращам ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Пощата е изпратена"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Внимание"
 
@@ -668,6 +677,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Създаване на <strong>админ профил</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Парола"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index a83ddb504f..8a66e3ef16 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr "Невалидна директория."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Файлове"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Качването е спряно."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Споделяне"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Изтриване завинаги"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Преименуване"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Грешка"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Чакащо"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Грешка"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Име"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Размер"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Променено"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Име"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Размер"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Променено"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr "Запис"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Ново"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Текстов файл"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Нова папка"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Папка"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Спри качването"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Няма нищо тук. Качете нещо."
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Изтриване"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Файлът който сте избрали за качване е прекалено голям"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файловете които се опитвате да качите са по-големи от позволеното за сървъра."
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Файловете се претърсват, изчакайте."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index f748e7dfd7..aaefc159d5 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Място"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Потребител"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Парола"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Споделяне"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "Уеб адрес"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Достъпът е даден"
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index fa5dd98bf5..40795c5f88 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 12:53+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "споделено от %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Изтегляне"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index 32fb65bc9f..e34d9be50a 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Невъзможно перманентното изтриване на
 msgid "Couldn't restore %s"
 msgstr "Невъзможно възтановяване на %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "Име"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Възтановяване"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Грешка"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Няма нищо. Кофата е празна!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Име"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Изтрито"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Изтриване"
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index be92245e98..9b6839fa71 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +18,15 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -74,23 +77,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "уеб услуги под Ваш контрол"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Изтеглянето като ZIP е изключено."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Файловете трябва да се изтеглят един по един."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Назад към файловете"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Избраните файлове са прекалено големи за генерирането на ZIP архив."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -276,19 +279,19 @@ msgstr "Въведете потребителско име за админист
 msgid "Set an admin password."
 msgstr "Въведете парола за администратор."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>."
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -330,73 +333,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Невъзможно откриване на категорията \"%s\""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 8d9891e1d2..8b07c09eb0 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Криптиране"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Email адреса е записан"
@@ -114,6 +124,16 @@ msgstr "Невъзможно изтриване на група"
 msgid "Unable to delete user"
 msgstr "Невъзможно изтриване на потребител"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Езикът е променен"
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr "Обновяване"
 msgid "Updated"
 msgstr "Обновено"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "изтрито"
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Адрес на сървъра"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Още"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "По-малко"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr "Език"
 msgid "Help translate"
 msgstr "Помогнете с превода"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Потребител"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 3e1f1eac0b..2a7b6189b1 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Грешка"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr[1] ""
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:984
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index fc4de2ea84..7d9d478b4f 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "রবিবার"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "সোমবার"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "মঙ্গলবার"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "বুধবার"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "বৃহস্পতিবার"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "শুক্রবার"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "শনিবার"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "জানুয়ারি"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "ফেব্রুয়ারি"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "মার্চ"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "এপ্রিল"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "মে"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "জুন"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "জুলাই"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "অগাষ্ট"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "সেপ্টেম্বর"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "অক্টোবর"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "নভেম্বর"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "ডিসেম্বর"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "নিয়ামকসমূহ"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "সংরক্ষণ করা হচ্ছে.."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "সেকেন্ড পূর্বে"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "আজ"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "গতকাল"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "গত মাস"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "গত বছর"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "বছর পূর্বে"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "বেছে নিন"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "হ্যাঁ"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "না"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "বেছে নিন"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "তথাস্তু"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "বাতির"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr "ভাগাভাগিকৃত"
 msgid "Share"
 msgstr "ভাগাভাগি কর"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "সমস্যা"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে  "
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "কূটশব্দ সুরক্ষিত"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "কূটশব্দ"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "ব্যক্তির সাথে ই-মেইল যুক্ত কর"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "পাঠাও"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "ই-মেইলের মাধ্যমে ভাগাভাগি করুনঃ"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "কোন ব্যক্তি খুঁজে পাওয়া গেল না"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "পূনঃরায় ভাগাভাগি অনুমোদিত নয়"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "ভাগাভাগি বাতিল "
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "সম্পাদনা করতে পারবেন"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "অধিগম্যতা নিয়ন্ত্রণ"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "তৈরী করুন"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "পরিবর্ধন কর"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "মুছে ফেল"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "ভাগাভাগি কর"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "কূটশব্দদ্বারা সুরক্ষিত"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "পাঠানো হচ্ছে......"
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "ই-মেইল পাঠানো হয়েছে"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "সতর্কবাণী"
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "কূটশব্দ"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 8432a74308..794ee1dad7 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -27,7 +27,7 @@ msgstr "%s কে স্থানান্তর করা সম্ভব হ
 msgid "Could not move %s"
 msgstr "%s  কে স্থানান্তর করা সম্ভব হলো না"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "ফাইলের নামটি ফাঁকা রাখা যাবে না।"
 
@@ -36,18 +36,18 @@ msgstr "ফাইলের নামটি ফাঁকা রাখা যা
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "নামটি সঠিক নয়,  '\\', '/', '<', '>', ':', '\"', '|', '?' এবং  '*'  অনুমোদিত নয়।"
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr "ভুল ডিরেক্টরি"
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "ফাইল"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "আপলোড বাতিল করা হয়েছে।"
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠ
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} টি বিদ্যমান"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "ভাগাভাগি কর"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "পূনঃনামকরণ"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "সমস্যা"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "মুলতুবি"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "সমস্যা"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "রাম"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "আকার"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "পরিবর্তিত"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "রাম"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "আকার"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "পরিবর্তিত"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr "ZIP ফাইলের ইনপুটের সর্বোচ্চ 
 msgid "Save"
 msgstr "সংরক্ষণ"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "নতুন"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "টেক্সট ফাইল"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "ফোল্ডার"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr " লিংক থেকে"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "আপলোড বাতিল কর"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "এখানে কিছুই নেই। কিছু আপলোড করুন !"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "ডাউনলোড"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "মুছে"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "আপলোডের আকারটি অনেক বড়"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন "
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।"
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "বর্তমান স্ক্যানিং"
diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po
index ac322b9942..05e56b5366 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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,6 +17,166 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "াবস্থান"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "হোস্ট"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "ব্যবহারকারী"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "কূটশব্দ"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "ভাগাভাগি কর"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "অধিগমনের  অনুমতি প্রদান করা হলো"
@@ -41,29 +201,29 @@ msgstr "Google Drive সংরক্ষণাগার নির্ধারণ
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index 67f9f305c7..c35c6f7ce3 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "ডাউনলোড"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index b75add2cf3..3656674825 100644
--- a/l10n/bn_BD/files_trashbin.po
+++ b/l10n/bn_BD/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "রাম"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "সমস্যা"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "রাম"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "মুছে"
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index 5261719357..aa0e0b1435 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "ওয়েব সার্ভিস আপনার হাতের মুঠোয়"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP ডাউনলোড বন্ধ করা আছে।"
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "ফাইলগুলো একে একে ডাউনলোড করা আবশ্যক।"
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "ফাইলে ফিরে চল"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "নির্বাচিত ফাইলগুলো এতই বৃহৎ যে জিপ ফাইল তৈরী করা সম্ভব নয়।"
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 623325c221..843389f7fc 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "সংকেতায়ন"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "ই-মেইল সংরক্ষন করা হয়েছে"
@@ -114,6 +124,16 @@ msgstr "গোষ্ঠী মুছে ফেলা সম্ভব হলো 
 msgid "Unable to delete user"
 msgstr "ব্যবহারকারী মুছে ফেলা সম্ভব হলো না "
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "ভাষা পরিবর্তন করা হয়েছে"
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr "পরিবর্ধন"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "সার্ভার ঠিকানা"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "পোর্ট"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "বেশী"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "কম"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "ভার্সন"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr "ভাষা"
 msgid "Help translate"
 msgstr "অনুবাদ করতে সহায়তা করুন"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "প্রবেশ"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index cfc7d39bbf..5bc4c6e820 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -86,65 +86,65 @@ msgstr ""
 msgid "Error"
 msgstr "সমস্যা"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index 3100ac1ded..9ab77fc911 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,212 +58,212 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Spašavam..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -295,12 +295,12 @@ msgstr ""
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -328,107 +328,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -672,6 +681,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/bs/files.po b/l10n/bs/files.po
index 55b371ee98..2adb9a2098 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,134 +177,138 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Ime"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Veličina"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Ime"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Veličina"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -337,68 +345,75 @@ msgstr ""
 msgid "Save"
 msgstr "Spasi"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nova fascikla"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Fasikla"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/bs/files_external.po b/l10n/bs/files_external.po
index fbe15ff86f..e656955787 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ 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"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Podijeli"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/bs/files_sharing.po b/l10n/bs/files_sharing.po
index b43e3b6b0b..74a67fbf25 100644
--- a/l10n/bs/files_sharing.po
+++ b/l10n/bs/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/bs/files_trashbin.po b/l10n/bs/files_trashbin.po
index 7f286786a0..30c9c123a5 100644
--- a/l10n/bs/files_trashbin.po
+++ b/l10n/bs/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr "Ime"
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/bs/lib.po b/l10n/bs/lib.po
index ab0f8df8df..23d8c1fc06 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ 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"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po
index 484b7e50b1..fa61565331 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 1e564d686f..06f1b05d71 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -61,207 +61,207 @@ msgstr "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho"
 msgid "No crop data provided"
 msgstr "No heu proporcionat dades del retall"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Dilluns"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Dijous"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Divendres"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Gener"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Febrer"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Març"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Abril"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Maig"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Juny"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Juliol"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Agost"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Setembre"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Octubre"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Novembre"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Desembre"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Configuració"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Desant..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "fa %n minut"
 msgstr[1] "fa %n minuts"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "fa %n hora"
 msgstr[1] "fa %n hores"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "avui"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "ahir"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "fa %n dies"
 msgstr[1] "fa %n dies"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "el mes passat"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "fa %n mes"
 msgstr[1] "fa %n mesos"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "l'any passat"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "anys enrere"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Escull"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Error en carregar la plantilla de càrrega de fitxers: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Escull"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Error en carregar la plantilla de càrrega de fitxers: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "D'acord"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Error en carregar la plantilla de missatge: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} conflicte de fitxer"
 msgstr[1] "{count} conflictes de fitxer"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Un fitxer en conflicte"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Fitxers nous"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Fitxers que ja existeixen"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Quin fitxer voleu conservar?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Continua"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(selecciona-ho tot)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} seleccionats)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Error en carregar la plantilla de fitxer existent"
 
@@ -293,12 +293,12 @@ msgstr "Compartit"
 msgid "Share"
 msgstr "Comparteix"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Error en compartir"
 
@@ -326,107 +326,116 @@ msgstr "Comparteix amb usuari o grup..."
 msgid "Share link"
 msgstr "Enllaç de compartició"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Protegir amb contrasenya"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Contrasenya"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Permet pujada pública"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Enllaç per correu electrónic amb la persona"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Envia"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Estableix la data de venciment"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Data de venciment"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Comparteix per correu electrònic"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "No s'ha trobat ningú"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grup"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "No es permet compartir de nou"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Compartit en {item} amb {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Deixa de compartir"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "notifica per correu electrònic"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "pot editar"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "control d'accés"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "crea"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "actualitza"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "elimina"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "comparteix"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Protegeix amb contrasenya"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Error en eliminar la data de venciment"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Error en establir la data de venciment"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Enviant..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "El correu electrónic s'ha enviat"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Avís"
 
@@ -670,6 +679,10 @@ msgstr "Per informació de com configurar el servidor, comproveu la <a href=\"%s
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>compte d'administrador</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Contrasenya"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Emmagatzematge i base de dades"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index c0a73a1db3..bcb1600154 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -7,12 +7,13 @@
 # jmontane <joan@montane.cat>, 2013
 # Josep Tomàs <jtomas.binsoft@gmail.com>, 2013
 # mickymadsystems <micky@madsystems.cat>, 2014
+# black_star <peredelgrau@hotmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -31,7 +32,7 @@ msgstr "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom"
 msgid "Could not move %s"
 msgstr " No s'ha pogut moure %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "El nom del fitxer no pot ser buit."
 
@@ -40,18 +41,18 @@ msgstr "El nom del fitxer no pot ser buit."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" no es un fitxer vàlid."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "La carpeta de destí s'ha mogut o eliminat."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -143,28 +144,32 @@ msgstr "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer."
 msgid "Invalid directory."
 msgstr "Directori no vàlid."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Fitxers"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "No es pot pujar {filename} perquè és una carpeta o té 0 bytes"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Mida total del fitxer {size1} excedeix el límit de pujada {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 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:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "La pujada s'ha cancel·lat."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "No hi ha resposta del servidor."
 
@@ -177,131 +182,135 @@ msgstr "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·l
 msgid "URL cannot be empty"
 msgstr "L'URL no pot ser buit"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} ja existeix"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "No s'ha pogut crear el fitxer"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "No s'ha pogut crear la carpeta"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Error en obtenir la URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Comparteix"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Esborra permanentment"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Reanomena"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Error en moure el fitxer"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Error"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Pendent"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Error en moure el fitxer."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Error en moure el fitxer"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Error"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "No es pot canviar el nom de fitxer"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Error en esborrar el fitxer."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nom"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Mida"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Modificat"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n carpeta"
 msgstr[1] "%n carpetes"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fitxer"
 msgstr[1] "%n fitxers"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} i {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Pujant %n fitxer"
 msgstr[1] "Pujant %n fitxers"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" no es un fitxer vàlid."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden actualitzar o sincronitzar!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou."
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "La clau privada de l'aplicació d'encriptació no és vàlida! Actualitzeu la contrasenya de la clau privada a l'arranjament personal per recuperar els fitxers encriptats."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} i {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nom"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Mida"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Modificat"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s no es pot canviar el nom"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -338,68 +347,75 @@ msgstr "Mida màxima d'entrada per fitxers ZIP"
 msgid "Save"
 msgstr "Desa"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Nou"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Nou fitxer de text"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Fitxer de text"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Carpeta nova"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Carpeta"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Des d'enllaç"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Fitxers esborrats"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Cancel·la la pujada"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Res per aquí. Pugeu alguna cosa!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Esborra"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "La pujada és massa gran"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "S'estan escanejant els fitxers, espereu"
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Actualment escanejant"
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index a898377bcd..deda2903ce 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-15 08:30+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -19,6 +19,166 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Local"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Ubicació"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Equip remot"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Nom d'usuari"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Contrasenya"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Comparteix"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "S'ha concedit l'accés"
@@ -43,29 +203,29 @@ msgstr "Error en configurar l'emmagatzemament Google Drive"
 msgid "Saved"
 msgstr "Desat"
 
-#: lib/config.php:598
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Nota:</b> "
 
-#: lib/config.php:608
+#: lib/config.php:599
 msgid " and "
 msgstr "i"
 
-#: lib/config.php:630
+#: lib/config.php:621
 #, 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 "<b>Nota:</b> El suport cURL no està activat o instal·lat a PHP. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li."
 
-#: lib/config.php:632
+#: lib/config.php:623
 #, 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 "<b>Nota:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li."
 
-#: lib/config.php:634
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 9452db004b..454e7d1f3f 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 08:52+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Compartits per {owner}"
 
@@ -58,16 +58,15 @@ msgstr "s'ha desactivat la compartició"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Per més informació contacteu amb qui us ha enviat l'enllaç."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "compartit per %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Baixa"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Baixa %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Enllaç directe"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index 936cd31894..408e78b4e8 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "No s'ha pogut esborrar permanentment %s"
 msgid "Couldn't restore %s"
 msgstr "No s'ha pogut restaurar %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Fitxers esborrats"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Error"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Fitxers eliminats"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "restaurat"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "La paperera està buida!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nom"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Recupera"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Error"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "restaurat"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "La paperera està buida!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nom"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Eliminat"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Esborra"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 5a980809bc..c8b824fa64 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -18,12 +18,15 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -74,23 +77,23 @@ msgstr "Imatge no vàlida"
 msgid "web services under your control"
 msgstr "controleu els vostres serveis web"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "La baixada en ZIP està desactivada."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Els fitxers s'han de baixar d'un en un."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Torna a Fitxers"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Els fitxers seleccionats son massa grans per generar un fitxer zip."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -276,19 +279,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:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s ha compartit »%s« amb tu"
@@ -330,73 +333,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "No s'ha trobat la categoria \"%s\""
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index a5ec54b996..21c21e2523 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -50,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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Mode d'enviament"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Xifrat"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Mètode d'autenticació"
 
@@ -101,6 +101,16 @@ msgstr "No es poden desencriptar els fitxers. Comproveu owncloud.log o demaneu-h
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "No s'han pogut desencriptar els fitxers, comproveu la contrasenya i proveu-ho de nou"
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "S'ha desat el correu electrònic"
@@ -117,6 +127,16 @@ msgstr "No es pot eliminar el grup"
 msgid "Unable to delete user"
 msgstr "No es pot eliminar l'usuari"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "S'ha canviat l'idioma"
@@ -172,7 +192,7 @@ msgstr "El dorsal no permet canviar la contrasenya, però la clau d'encripació
 msgid "Unable to change password"
 msgstr "No es pot canviar la contrasenya"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Enviant..."
 
@@ -228,34 +248,42 @@ msgstr "Actualitza"
 msgid "Updated"
 msgstr "Actualitzada"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Seleccioneu una imatge de perfil"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Contrasenya massa feble"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Contrasenya feble"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Contrasenya passable"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Contrasenya bona"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Contrasenya forta"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Desencriptant fitxers... Espereu, això pot trigar una estona."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "esborrat"
@@ -301,7 +329,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Català"
 
@@ -489,148 +517,143 @@ msgstr "Permet que les aplicacions utilitzin l'API de compartir"
 msgid "Allow links"
 msgstr "Permet enllaços"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Permet pujada pública"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Permet compartir de nou"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Permet compartir amb qualsevol"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Permet notificacions per correu electrónic"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+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:252
+msgid "Allow resharing"
+msgstr "Permet compartir de nou"
+
+#: templates/admin.php:253
+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:260
+msgid "Allow users to share with anyone"
+msgstr "Permet compartir amb qualsevol"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
+msgstr "Permet notificacions per correu electrónic"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Seguretat"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Força HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "Servidor de correu"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "S'usa per enviar notificacions."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Des de l'adreça"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Es requereix autenticació"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Adreça del servidor"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Credencials"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "Nom d'usuari SMTP"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "Contrasenya SMTP"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Prova l'arranjament del correu"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Envia correu"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Nivell de registre"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Més"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Menys"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versió"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -783,29 +806,33 @@ msgstr "Idioma"
 msgid "Help translate"
 msgstr "Ajudeu-nos amb la traducció"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Contrasenya d'accés"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Desencripta tots els fitxers"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Nom d'accés"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index c3a103518c..8ced957ef1 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -89,65 +89,65 @@ msgstr "Èxit"
 msgid "Error"
 msgstr "Error"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuració correcte"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Configuració incorrecte"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Configuració incompleta"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Selecciona els grups"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Seleccioneu les classes dels objectes"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Seleccioneu els atributs"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "La prova de connexió ha reeixit"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "La prova de connexió ha fallat"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Voleu eliminar la configuració actual del servidor?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Confirma l'eliminació"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "S'ha trobat %s grup"
 msgstr[1] "S'han trobat %s grups"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "S'ha trobat %s usuari"
 msgstr[1] "S'han trobat %s usuaris"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Ordinador central no vàlid"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "La característica desitjada no s'ha trobat"
 
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 8effd3dc1f..6e144459a7 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -67,212 +67,212 @@ msgstr "Dočasný profilový obrázek není k dispozici, zkuste to znovu"
 msgid "No crop data provided"
 msgstr "Nebyla poskytnuta data pro oříznutí obrázku"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Neděle"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Pondělí"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Středa"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Pátek"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sobota"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Leden"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Únor"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Březen"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Duben"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Květen"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Červen"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Červenec"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Srpen"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Září"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Říjen"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Listopad"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Prosinec"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Nastavení"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Ukládám..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "před pár vteřinami"
 
-#: js/js.js:1247
+#: js/js.js:1241
 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:1248
+#: js/js.js:1242
 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:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:1251
+#: js/js.js:1245
 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:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "minulý měsíc"
 
-#: js/js.js:1253
+#: js/js.js:1247
 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:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "před lety"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Vybrat"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Chyba při nahrávání šablony výběru souborů: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Ano"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Vybrat"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Chyba při nahrávání šablony výběru souborů: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Chyba při nahrávání šablony zprávy: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} souborový konflikt"
 msgstr[1] "{count} souborové konflikty"
 msgstr[2] "{count} souborových konfliktů"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Jeden konflikt souboru"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Nové soubory"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
-msgstr "Soubory již existují"
+msgstr "Již existující soubory"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Které soubory chcete ponechat?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Pokračovat"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(vybráno vše)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "(vybráno {count})"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Chyba při nahrávání šablony existence souboru"
 
@@ -304,12 +304,12 @@ msgstr "Sdílené"
 msgid "Share"
 msgstr "Sdílet"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Chyba"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Chyba při sdílení"
 
@@ -337,107 +337,116 @@ msgstr "Sdílet s uživatelem nebo skupinou"
 msgid "Share link"
 msgstr "Sdílet odkaz"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Chránit heslem"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Heslo"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Povolit veřejné nahrávání"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Odeslat osobě odkaz e-mailem"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Odeslat"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Nastavit datum vypršení platnosti"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Datum vypršení platnosti"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Sdílet e-mailem:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Žádní lidé nenalezeni"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "skupina"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Sdílení již sdílené položky není povoleno"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Sdíleno v {item} s {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Zrušit sdílení"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "upozornit e-mailem"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "lze upravovat"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "řízení přístupu"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "vytvořit"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "aktualizovat"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "smazat"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "sdílet"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Chráněno heslem"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Chyba při odstraňování data vypršení platnosti"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Chyba při nastavení data vypršení platnosti"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Odesílám ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "E-mail odeslán"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Varování"
 
@@ -681,6 +690,10 @@ msgstr "Pro informace, jak správně nastavit váš server, se podívejte do <a
 msgid "Create an <strong>admin account</strong>"
 msgstr "Vytvořit <strong>účet správce</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Heslo"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Úložiště & databáze"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index ea1a69de04..4f0d65a00c 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -7,6 +7,7 @@
 # dibalaj <dibalaj@dibalaj.cz>, 2013
 # Honza K. <honza889@gmail.com>, 2013
 # liska_, 2013-2014
+# svetlemodry <jaroslav@lichtblau.cz>, 2014
 # xmorave2 <josef.moravec@gmail.com>, 2014
 # cvanca <mrs.jenkins.oh.yeah@gmail.com>, 2013
 # m23 <black23@gmail.com>, 2014
@@ -16,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -36,7 +37,7 @@ msgstr "Nelze přesunout %s - již existuje soubor se stejným názvem"
 msgid "Could not move %s"
 msgstr "Nelze přesunout %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Název souboru nemůže být prázdný řetězec."
 
@@ -45,18 +46,18 @@ msgstr "Název souboru nemůže být prázdný řetězec."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" je neplatným názvem souboru."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Cílová složka byla přesunuta nebo smazána."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -148,28 +149,32 @@ msgstr "Nahrávání selhalo. Nepodařilo se získat informace o souboru."
 msgid "Invalid directory."
 msgstr "Neplatný adresář"
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Soubory"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má velikost 0 bytů"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Celková velikost souboru {size1} překračuje povolenou velikost pro nahrávání {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 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:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Odesílání zrušeno."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Nepodařilo se získat výsledek ze serveru."
 
@@ -182,134 +187,138 @@ msgstr "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení
 msgid "URL cannot be empty"
 msgstr "URL nemůže zůstat prázdná"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} již existuje"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Nepodařilo se vytvořit soubor"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Nepodařilo se vytvořit složku"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Chyba při načítání URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Sdílet"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Trvale odstranit"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Chyba při přesunu souboru"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Chyba"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Nevyřízené"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Chyba při přesunu souboru."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Chyba při přesunu souboru"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Chyba"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Nepodařilo se přejmenovat soubor"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Chyba při mazání souboru."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Název"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Velikost"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Upraveno"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 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:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n soubor"
 msgstr[1] "%n soubory"
 msgstr[2] "%n souborů"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} a {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Nahrávám %n soubor"
 msgstr[1] "Nahrávám %n soubory"
 msgstr[2] "Nahrávám %n souborů"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" je neplatným názvem souboru."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory."
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Vaše úložiště je téměř plné ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste"
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} a {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Název"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Velikost"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Upraveno"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s nemůže být přejmenován"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Nahrát (max. %s)"
@@ -346,68 +355,75 @@ msgstr "Maximální velikost vstupu pro ZIP soubory"
 msgid "Save"
 msgstr "Uložit"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Nový"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Nový textový soubor"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Textový soubor"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nová složka"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Složka"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Z odkazu"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Odstraněné soubory"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Zrušit odesílání"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Žádný obsah. Nahrajte něco."
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Smazat"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Odesílaný soubor je příliš velký"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Soubory se prohledávají, prosím čekejte."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Aktuální prohledávání"
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 82abf9c3df..c1912393c3 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-22 01:54-0400\n"
-"PO-Revision-Date: 2014-04-21 17:44+0000\n"
-"Last-Translator: svetlemodry <jaroslav@lichtblau.cz>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -20,6 +20,166 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Místní"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Umístění"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Klíč"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Tajemství"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "Přístupový klíč"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Tajný klíč"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "Hostname (nepovinný)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Port (nepovinný)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Region (nepovinný)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Povolit SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "Klíč aplikace"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr "Tajemství aplikace"
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Počítač"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Uživatelské jméno"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Heslo"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Root"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "Zabezpečené ftps://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Uživatelské jméno (nutné)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr "Region (nepovinný pro OpenStack Object Storage)"
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr "Heslo (vyžadováno pro OpenStack Object Storage)"
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr "Vypršení HTTP požadavků v sekundách (nepovinné)"
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Sdílet"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr "SMB / CIFS za použití OC loginu"
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr "Uživatelské jméno jako sdílený adresář"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "Zabezpečené https://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "Vzdálený podadresář"
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Přístup povolen"
@@ -44,29 +204,29 @@ msgstr "Chyba při nastavení úložiště Google Drive"
 msgid "Saved"
 msgstr "Uloženo"
 
-#: lib/config.php:598
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Poznámka:</b>"
 
-#: lib/config.php:608
+#: lib/config.php:599
 msgid " and "
 msgstr "a"
 
-#: lib/config.php:630
+#: lib/config.php:621
 #, 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 "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje."
 
-#: lib/config.php:632
+#: lib/config.php:623
 #, 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 "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje."
 
-#: lib/config.php:634
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -103,7 +263,7 @@ msgstr "Přidat úložiště"
 
 #: templates/settings.php:92
 msgid "No user or group"
-msgstr "Žádný uživatel nebo skupina."
+msgstr "Žádný uživatel nebo skupina"
 
 #: templates/settings.php:95
 msgid "All Users"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 4b4b4e76aa..a0b084e7c0 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-24 01:55-0400\n"
-"PO-Revision-Date: 2014-03-23 21:50+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -20,7 +20,7 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Sdílí {owner}"
 
@@ -60,16 +60,15 @@ msgstr "sdílení je zakázané"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "sdílí %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Stáhnout"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Stáhnout %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Přímý odkaz"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index f704f7a49d..fdcf928f47 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -29,38 +29,34 @@ msgstr "Nelze trvale odstranit %s"
 msgid "Couldn't restore %s"
 msgstr "Nelze obnovit %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Odstraněné soubory"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Chyba"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Smazané soubory"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "obnoveno"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Žádný obsah. Váš koš je prázdný."
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Název"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Obnovit"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Chyba"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "obnoveno"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Žádný obsah. Váš koš je prázdný."
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Název"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Smazáno"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Smazat"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index f76d4777ab..4d81306ab9 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Honza K. <honza889@gmail.com>, 2013
+# Honza K. <honza889@gmail.com>, 2013-2014
 # liska_, 2013
 # svetlemodry <jaroslav@lichtblau.cz>, 2014
 # xmorave2 <josef.moravec@gmail.com>, 2014
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 20:00+0000\n"
-"Last-Translator: svetlemodry <jaroslav@lichtblau.cz>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -24,13 +24,16 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
-msgstr ""
+msgstr "Přistupujete na server z nedůvěryhodné domény."
 
-#: base.php:724
-msgid "Please contact your administrator"
-msgstr "Kontaktujte prosím vašeho správce systému."
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr "Kontaktujte prosím správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. Příklad konfigurace najdete v souboru config/config.sample.php."
 
 #: private/app.php:236
 #, php-format
@@ -80,23 +83,23 @@ msgstr "Chybný obrázek"
 msgid "web services under your control"
 msgstr "webové služby pod Vaší kontrolou"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Stahování v ZIPu je vypnuto."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Soubory musí být stahovány jednotlivě."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Zpět k souborům"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Vybrané soubory jsou příliš velké pro vytvoření ZIP souboru."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -282,19 +285,19 @@ msgstr "Zadejte uživatelské jméno správce."
 msgid "Set an admin password."
 msgstr "Zadejte heslo správce."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s s vámi sdílí »%s«"
@@ -324,7 +327,7 @@ msgstr "Sdílení položky %s selhalo, protože uživatel %s není členem žád
 #: private/share/share.php:551 private/share/share.php:579
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
-msgstr "Sdílení položky %s selhalo, protože položka již je s uživatelem %s sdílená"
+msgstr "Sdílení položky %s selhalo, protože položka již je s uživatelem %s sdílena"
 
 #: private/share/share.php:559
 #, php-format
@@ -336,73 +339,79 @@ msgstr "Sdílení položky %s selhalo, protože skupina %s neexistuje"
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Sdílení položky %s selhalo, protože uživatel %s není členem skupiny %s"
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Sdílení položky %s selhalo, protože sdílení pomocí linků není povoleno"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
-msgstr ""
+msgstr "Sdílení typu %s není korektní pro %s"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
-msgstr ""
+msgstr "Nastavení práv pro %s selhalo, protože položka nebyla nalezena"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Nelze nalézt kategorii \"%s\""
@@ -463,7 +472,7 @@ msgstr "před lety"
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
-msgstr "Pouze následující znaky jsou povoleny v uživatelském jménu: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\""
+msgstr "Pouze následující znaky jsou povoleny v uživatelském jménu: \"a-z\", \"A-Z\", \"0-9\" a \"_.@-\""
 
 #: private/user/manager.php:237
 msgid "A valid username must be provided"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index fc665ac82a..7de68aee60 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -55,15 +55,15 @@ msgstr "E-mail odeslán"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu."
 
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Mód odesílání"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Šifrování"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Metoda ověření"
 
@@ -106,6 +106,16 @@ msgstr "Nebylo možno dešifrovat soubory, zkontroluje prosím owncloud.log nebo
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Nebylo možno dešifrovat soubory, zkontrolujte své heslo a zkuste znovu"
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "E-mail uložen"
@@ -122,6 +132,16 @@ msgstr "Nelze smazat skupinu"
 msgid "Unable to delete user"
 msgstr "Nelze smazat uživatele"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Jazyk byl změněn"
@@ -177,7 +197,7 @@ msgstr "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatel
 msgid "Unable to change password"
 msgstr "Změna hesla se nezdařila"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Odesílání..."
 
@@ -233,34 +253,42 @@ msgstr "Aktualizovat"
 msgid "Updated"
 msgstr "Aktualizováno"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Vyberte profilový obrázek"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Velmi slabé heslo"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Slabé heslo"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Středně silné heslo"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Dobré heslo"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Silné heslo"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "smazáno"
@@ -306,7 +334,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Česky"
 
@@ -494,148 +522,143 @@ msgstr "Povolit aplikacím používat API sdílení"
 msgid "Allow links"
 msgstr "Povolit odkazy"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Povolit veřejné nahrávání souborů"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Povolit znovu-sdílení"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Povolit uživatelům sdílet s kýmkoliv"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Povolit e-mailová upozornění"
-
-#: templates/admin.php:254
-msgid "Allow users 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:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
-msgstr ""
+msgstr "Nastavit výchozí datum vypršení platnosti"
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr "Vyprší po"
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr "dnech"
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
-msgstr ""
+msgstr "Vynutit datum vypršení"
+
+#: templates/admin.php:242
+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:252
+msgid "Allow resharing"
+msgstr "Povolit znovu-sdílení"
+
+#: templates/admin.php:253
+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:260
+msgid "Allow users to share with anyone"
+msgstr "Povolit uživatelům sdílet s kýmkoliv"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
-msgstr ""
+msgid "Allow mail notification"
+msgstr "Povolit e-mailová upozornění"
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users 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:279
 msgid "Security"
 msgstr "Zabezpečení"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Vynutit HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "E-mailový server"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Toto se používá pro odesílání upozornění."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Adresa odesílatele"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Vyžadováno ověření"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Adresa serveru"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Přihlašovací údaje"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "SMTP uživatelské jméno "
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "SMTP heslo"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Otestovat nastavení e-mailu"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Odeslat e-mail"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Úroveň zaznamenávání"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Více"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Méně"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Verze"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -788,29 +811,33 @@ msgstr "Jazyk"
 msgid "Help translate"
 msgstr "Pomoci s překladem"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Přihlašovací heslo"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Odšifrovat všechny soubory"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Přihlašovací jméno"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index e948916520..12d4fb0b75 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 19:50+0000\n"
-"Last-Translator: svetlemodry <jaroslav@lichtblau.cz>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -133,7 +133,7 @@ msgstr "Opravdu si přejete smazat současné nastavení serveru?"
 msgid "Confirm Deletion"
 msgstr "Potvrdit smazání"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -141,7 +141,7 @@ msgstr[0] "nalezena %s skupina"
 msgstr[1] "nalezeny %s skupiny"
 msgstr[2] "nalezeno %s skupin"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -149,11 +149,11 @@ msgstr[0] "nalezen %s uživatel"
 msgstr[1] "nalezeni %s uživatelé"
 msgstr[2] "nalezeno %s uživatelů"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Neplatný hostitel"
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Nelze nalézt požadovanou vlastnost"
 
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 6df89c597e..f3f8a80363 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -59,95 +59,95 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Sul"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Llun"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Mawrth"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Mercher"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Iau"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Gwener"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sadwrn"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Ionawr"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Chwefror"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Mawrth"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Ebrill"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Mehefin"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Gorffennaf"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Awst"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Medi"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Hydref"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Tachwedd"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Rhagfyr"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Yn cadw..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "eiliad yn ôl"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -155,7 +155,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -163,15 +163,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "heddiw"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "ddoe"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -179,11 +179,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "mis diwethaf"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -191,39 +191,39 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "y llynedd"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "blwyddyn yn ôl"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Dewisiwch"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Ie"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Na"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Dewisiwch"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Iawn"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
@@ -231,45 +231,45 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -301,12 +301,12 @@ msgstr "Rhannwyd"
 msgid "Share"
 msgstr "Rhannu"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Gwall"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Gwall wrth rannu"
 
@@ -334,107 +334,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Diogelu cyfrinair"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Cyfrinair"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "E-bostio dolen at berson"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Anfon"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Gosod dyddiad dod i ben"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Dyddiad dod i ben"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Rhannu drwy e-bost:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Heb ganfod pobl"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grŵp"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Does dim hawl ail-rannu"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Rhannwyd yn {item} â {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Dad-rannu"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "yn gallu golygu"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "rheolaeth mynediad"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "creu"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "diweddaru"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "dileu"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "rhannu"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Diogelwyd â chyfrinair"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Gwall wrth ddad-osod dyddiad dod i ben"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Gwall wrth osod dyddiad dod i ben"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Yn anfon ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Anfonwyd yr e-bost"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Rhybudd"
 
@@ -678,6 +687,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crewch <strong>gyfrif gweinyddol</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Cyfrinair"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index 2625a5b2b3..065c842dcd 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr "Methwyd symud %s - Mae ffeil gyda'r enw hwn eisoes yn bodoli"
 msgid "Could not move %s"
 msgstr "Methwyd symud %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Does dim hawl cael enw ffeil gwag."
 
@@ -36,18 +36,18 @@ msgstr "Does dim hawl cael enw ffeil gwag."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr "Cyfeiriadur annilys."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Ffeiliau"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Diddymwyd llwytho i fyny."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,55 +177,77 @@ msgstr "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} yn bodoli'n barod"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Rhannu"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Dileu'n barhaol"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr ""
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Gwall"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "I ddod"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Gwall"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Enw"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Maint"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Addaswyd"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
@@ -229,7 +255,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -237,11 +263,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -249,61 +271,47 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Enw"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Maint"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Addaswyd"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -340,68 +348,75 @@ msgstr "Maint mewnbynnu mwyaf ffeiliau ZIP"
 msgid "Save"
 msgstr "Cadw"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Newydd"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Ffeil destun"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Plygell"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Dolen o"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Ffeiliau ddilewyd"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Diddymu llwytho i fyny"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Llwytho i lawr"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Dileu"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Maint llwytho i fyny'n rhy fawr"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Arhoswch, mae ffeiliau'n cael eu sganio."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Sganio cyfredol"
diff --git a/l10n/cy_GB/files_external.po b/l10n/cy_GB/files_external.po
index 855d4d6f82..eb30c50c21 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Lleoliad"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Enw defnyddiwr"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Cyfrinair"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Rhannu"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index 68b808a855..261dfedcd3 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Llwytho i lawr"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po
index dadbbbd9b1..c04bbd89fb 100644
--- a/l10n/cy_GB/files_trashbin.po
+++ b/l10n/cy_GB/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr "Methwyd dileu %s yn barhaol"
 msgid "Couldn't restore %s"
 msgstr "Methwyd adfer %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Ffeiliau ddilewyd"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Gwall"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Ffeiliau Ddilewyd"
-
-#: 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 "Does dim byd yma. Mae eich bin sbwriel yn wag!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Enw"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Adfer"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Gwall"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Does dim byd yma. Mae eich bin sbwriel yn wag!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Enw"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Wedi dileu"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Dileu"
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index 19a1e5e794..4ba9c8873d 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "gwasanaethau gwe a reolir gennych"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Mae llwytho ZIP wedi ei ddiffodd."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Mae angen llwytho ffeiliau i lawr fesul un."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Nôl i Ffeiliau"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Mae'r ffeiliau ddewiswyd yn rhy fawr i gynhyrchu ffeil zip."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr "Creu enw defnyddiwr i'r gweinyddwr."
 msgid "Set an admin password."
 msgstr "Gosod cyfrinair y gweinyddwr."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Methu canfod categori \"%s\""
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index 33fa7e97f5..83f791abda 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Amgryptiad"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Mewngofnodi"
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index 6b1cdbb2a5..48e4810eef 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Gwall"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -148,7 +148,7 @@ msgstr[3] ""
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:984
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 62a96c69be..0d275fb3a7 100644
--- a/l10n/da/core.po
+++ b/l10n/da/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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -26,7 +26,7 @@ msgstr ""
 
 #: ajax/share.php:87
 msgid "Expiration date is in the past."
-msgstr ""
+msgstr "Udløbsdatoen er overskredet."
 
 #: ajax/share.php:119 ajax/share.php:161
 #, php-format
@@ -65,207 +65,207 @@ msgstr "Intet midlertidigt profilbillede tilgængeligt, prøv igen"
 msgid "No crop data provided"
 msgstr "Ingen beskæringsdata give"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Søndag"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Mandag"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Marts"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "April"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "August"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "December"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Gemmer..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minut siden"
 msgstr[1] "%n minutter siden"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n time siden"
 msgstr[1] "%n timer siden"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag siden"
 msgstr[1] "%n dage siden"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "sidste måned"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n måned siden"
 msgstr[1] "%n måneder siden"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "sidste år"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "år siden"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Vælg"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Fejl ved indlæsning af filvælger skabelon: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nej"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Vælg"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Fejl ved indlæsning af filvælger skabelon: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "OK"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Fejl ved indlæsning af besked skabelon: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} filkonflikt"
 msgstr[1] "{count} filkonflikter"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "En filkonflikt"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Nye filer"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
-msgstr ""
+msgstr "Allerede eksisterende filer"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Hvilke filer ønsker du at beholde?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Annuller"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Videre"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(alle valgt)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} valgt)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Fejl ved inlæsning af; fil eksistere skabelon"
 
@@ -297,12 +297,12 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Fejl"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Fejl under deling"
 
@@ -330,107 +330,116 @@ msgstr "Del med bruger eller gruppe ..."
 msgid "Share link"
 msgstr "Del link"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Beskyt med adgangskode"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Kodeord"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Tillad Offentlig Upload"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "E-mail link til person"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Vælg udløbsdato"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Udløbsdato"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Del via email:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Ingen personer fundet"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "gruppe"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Videredeling ikke tilladt"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "Giv besked med mail"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "kan redigere"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "Adgangskontrol"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "opret"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "opdater"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "slet"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "del"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Beskyttet med adgangskode"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Fejl ved fjernelse af udløbsdato"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Fejl under sætning af udløbsdato"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Sender ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "E-mail afsendt"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -549,12 +558,12 @@ msgstr "Nulstil kodeord"
 msgid ""
 "Mac OS X is not supported and %s will not work properly on this platform. "
 "Use it at your own risk! "
-msgstr ""
+msgstr "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!"
 
 #: setup/controller.php:144
 msgid ""
 "For the best results, please consider using a GNU/Linux server instead."
-msgstr ""
+msgstr "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet."
 
 #: strings.php:5
 msgid "Personal"
@@ -674,6 +683,10 @@ msgstr "For information om, hvordan du konfigurerer din server korrekt se <a hre
 msgid "Create an <strong>admin account</strong>"
 msgstr "Opret en <strong>administratorkonto</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Kodeord"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Lager & database"
@@ -777,7 +790,7 @@ msgstr "Alternative logins"
 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 med dig,<br><br>Dette er blot for at informere dig om, at %s har delt <strong>%s</strong> med dig.<br><a href=\"%s\">Se det her!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 7e71520115..f49e3e27cb 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -32,7 +32,7 @@ msgstr "Kunne ikke flytte %s - der findes allerede en fil med dette navn"
 msgid "Could not move %s"
 msgstr "Kunne ikke flytte %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Filnavnet kan ikke stå tomt."
 
@@ -41,18 +41,18 @@ msgstr "Filnavnet kan ikke stå tomt."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" er et ugyldigt filnavn."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Mappen er blevet slettet eller fjernet."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -144,28 +144,32 @@ msgstr "Upload fejlede. Kunne ikke hente filinformation."
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Filer"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Kan ikke upload {filename} da det er enten en mappe eller indholder 0 bytes."
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Den totale filstørrelse {size1} er større end uploadgrænsen {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage"
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Upload afbrudt."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Kunne ikke hente resultat fra server."
 
@@ -178,134 +182,138 @@ msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuler
 msgid "URL cannot be empty"
 msgstr "URL kan ikke være tom"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} eksisterer allerede"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Kunne ikke oprette fil"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Kunne ikke oprette mappe"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Fejl ved URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Del"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Slet permanent"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Omdøb"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Fejl ved flytning af fil"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Fejl"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Afventer"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Fejl ved flytning af fil"
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Fejl ved flytning af fil"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Fejl"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Kunne ikke omdøbe filen"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Fejl ved sletnign af fil."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Navn"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Størrelse"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Ændret"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappe"
 msgstr[1] "%n mapper"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
 msgstr[1] "%n filer"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} og {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Uploader %n fil"
 msgstr[1] "Uploader %n filer"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "'{name}' er et ugyldigt filnavn."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen."
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. "
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} og {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Navn"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Størrelse"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Ændret"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s kunne ikke omdøbes"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
-msgstr ""
+msgstr "Upload (max. %s)"
 
 #: templates/admin.php:4
 msgid "File handling"
@@ -339,68 +347,75 @@ msgstr "Maksimal størrelse på ZIP filer"
 msgid "Save"
 msgstr "Gem"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Ny tekstfil"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Tekstfil"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Ny Mappe"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Mappe"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Fra link"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Slettede filer"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Fortryd upload"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Her er tomt. Upload noget!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Upload er for stor"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Filerne bliver indlæst, vent venligst."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Indlæser"
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index 4a0d6ece90..c82bc96039 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sappe, 2014
 # Amplificator, 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-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -18,6 +19,166 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Lokal"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Placering"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Nøgle"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Hemmelighed"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Hemmelig Nøgle "
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Brugernavn"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Kodeord"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Root"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "Sikker ftps://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "Klient ID"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr "Klient hemmelighed"
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr "OpenStack Object Storage"
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Del"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "Sikker https://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Adgang godkendt"
@@ -42,29 +203,29 @@ msgstr "Fejl ved konfiguration af Google Drive plads"
 msgid "Saved"
 msgstr "Gemt"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>Note:</b> "
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
-msgstr ""
+msgstr "og"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -93,7 +254,7 @@ msgstr "Valgmuligheder"
 
 #: templates/settings.php:12
 msgid "Available for"
-msgstr ""
+msgstr "Tilgængelig for"
 
 #: templates/settings.php:32
 msgid "Add storage"
@@ -101,7 +262,7 @@ msgstr "Tilføj lager"
 
 #: templates/settings.php:92
 msgid "No user or group"
-msgstr ""
+msgstr "Ingen bruger eller gruppe"
 
 #: templates/settings.php:95
 msgid "All Users"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index a1f254615e..e8cec57dc9 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-24 01:55-0400\n"
-"PO-Revision-Date: 2014-03-23 18:20+0000\n"
-"Last-Translator: Amplificator\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Delt af {owner}"
 
@@ -60,16 +60,15 @@ msgstr "deling er deaktiveret"
 msgid "For more info, please ask the person who sent this link."
 msgstr "For yderligere information, kontakt venligst personen der sendte linket. "
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "delt af %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Download"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Download %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Direkte link"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index 6b4c9cc53b..3db9c94e5f 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -29,38 +29,34 @@ msgstr "Kunne ikke slette %s permanent"
 msgid "Couldn't restore %s"
 msgstr "Kunne ikke gendanne %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Slettede filer"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Fejl"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Slettede filer"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "Gendannet"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Intet at se her. Din papirkurv er tom!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Navn"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Gendan"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Fejl"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "Gendannet"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Intet at se her. Din papirkurv er tom!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Navn"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Slettet"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Slet"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index dc85a7ff6b..290287c571 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +21,15 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -77,23 +80,23 @@ msgstr "Ugyldigt billede"
 msgid "web services under your control"
 msgstr "Webtjenester under din kontrol"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP-download er slået fra."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Filer skal downloades en for en."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Tilbage til Filer"
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -279,19 +282,19 @@ msgstr "Angiv et admin brugernavn."
 msgid "Set an admin password."
 msgstr "Angiv et admin kodeord."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s delte »%s« med sig"
@@ -333,73 +336,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Kunne ikke finde kategorien \"%s\""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index f527b399c8..b9296f9f4c 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -102,6 +102,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Email adresse gemt"
@@ -118,6 +128,16 @@ msgstr "Gruppen kan ikke slettes"
 msgid "Unable to delete user"
 msgstr "Bruger kan ikke slettes"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Sprog ændret"
@@ -173,7 +193,7 @@ msgstr "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnø
 msgid "Unable to change password"
 msgstr "Kunne ikke ændre kodeord"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Sender..."
 
@@ -229,34 +249,42 @@ msgstr "Opdater"
 msgid "Updated"
 msgstr "Opdateret"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Vælg et profilbillede"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Meget svagt kodeord"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Svagt kodeord"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Jævnt kodeord"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Godt kodeord"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Stærkt kodeord"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dekryptere filer... Vent venligst, dette kan tage lang tid. "
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "Slettet"
@@ -302,7 +330,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Dansk"
 
@@ -490,148 +518,143 @@ msgstr "Tillad apps til at bruge Share API"
 msgid "Allow links"
 msgstr "Tillad links"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Tillad offentlig upload"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Tillad videredeling"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Tillad brugere at dele med alle"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Tillad mail underretninger"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
-msgstr ""
+msgstr "Udløber efter"
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
-msgstr ""
+msgstr "dage"
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Tillad brugere at dele elementer til offentligheden med links"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Tillad videredeling"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Tillad brugere at dele elementer delt med dem igen"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Tillad brugere at dele med alle"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
+msgstr "Tillad mail underretninger"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Sikkerhed"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Gennemtving HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "Email Server"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Fra adresse"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Godkendelse påkrævet"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Serveradresse"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Brugeroplysninger"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "SMTP Brugernavn"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "SMTP Kodeord"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Test email indstillinger"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Send email"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Mere"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -784,29 +807,33 @@ msgstr "Sprog"
 msgid "Help translate"
 msgstr "Hjælp med oversættelsen"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Log-in kodeord"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Dekrypter alle Filer "
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Loginnavn"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index fef82e070a..da3316a133 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -87,65 +87,65 @@ msgstr "Succes"
 msgid "Error"
 msgstr "Fejl"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Vælg grupper"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Forbindelsestest lykkedes"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Forbindelsestest mislykkedes"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Ønsker du virkelig at slette den nuværende Server Konfiguration?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Bekræft Sletning"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 91537915a8..8d774d2031 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 16:17+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"
@@ -69,207 +69,207 @@ msgstr "Kein temporäres Profilbild verfügbar, bitte versuche es nochmal"
 msgid "No crop data provided"
 msgstr "Keine Zuschnittdaten zur Verfügung gestellt"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Montag"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Freitag"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Samstag"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "März"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "April"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "August"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Vor %n Minute"
 msgstr[1] "Vor %n Minuten"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Vor %n Stunde"
 msgstr[1] "Vor %n Stunden"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Vor %n Tag"
 msgstr[1] "Vor %n Tagen"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Vor %n Monat"
 msgstr[1] "Vor %n Monaten"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "Vor Jahren"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Auswählen"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nein"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Auswählen"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "OK"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} Dateikonflikt"
 msgstr[1] "{count} Dateikonflikte"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Ein Dateikonflikt"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Neue Dateien"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Die Dateien existieren bereits"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Welche Dateien möchtest Du behalten?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Fortsetzen"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(Alle ausgewählt)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} ausgewählt)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Fehler beim Laden der vorhanden Dateivorlage"
 
@@ -301,12 +301,12 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Fehler"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
@@ -334,107 +334,116 @@ msgstr "Mit Benutzer oder Gruppe teilen ...."
 msgid "Share link"
 msgstr "Link Teilen"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen"
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr "Standardmäßig wird der öffentliche Link nach {days} Tagen ablaufen"
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passwort"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr "Wählen Sie ein Passwort für den öffentlichen Link"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Öffentliches Hochladen erlauben"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Setze ein Ablaufdatum"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Über eine E-Mail teilen:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "Gruppe"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Für {user} in {item} freigegeben"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "Per E-Mail informieren"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "löschen"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Durch ein Passwort geschützt"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "E-Mail wurde verschickt"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Warnung"
 
@@ -678,6 +687,10 @@ msgstr "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bit
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passwort"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Speicher & Datenbank"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 5198447b52..dc79e5cfaa 100644
--- a/l10n/de/files.po
+++ b/l10n/de/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 16:17+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"
@@ -35,7 +35,7 @@ msgstr "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert berei
 msgid "Could not move %s"
 msgstr "Konnte %s nicht verschieben"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Der Dateiname darf nicht leer sein."
 
@@ -44,18 +44,18 @@ msgstr "Der Dateiname darf nicht leer sein."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" ist kein gültiger Dateiname."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Der Zielordner wurde verschoben oder gelöscht."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -147,28 +147,32 @@ msgstr "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen wer
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Dateien"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Alle Dateien"
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 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:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Ergebnis konnte nicht vom Server abgerufen werden."
 
@@ -181,131 +185,135 @@ msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload a
 msgid "URL cannot be empty"
 msgstr "Die URL darf nicht leer sein"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Die Datei konnte nicht erstellt werden"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Der Ordner konnte nicht erstellt werden"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Fehler beim Abrufen der URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Teilen"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Fehler beim Verschieben der Datei"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Fehler"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Fehler beim Verschieben der Datei."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Fehler beim Verschieben der Datei"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Fehler"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Die Datei konnte nicht umbenannt werden"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Fehler beim Löschen der Datei."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Name"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Größe"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Geändert"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n Ordner"
 msgstr[1] "%n Ordner"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n Datei"
 msgstr[1] "%n Dateien"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} und {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n Datei wird hochgeladen"
 msgstr[1] "%n Dateien werden hochgeladen"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" ist kein gültiger Dateiname."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Dein Speicher ist fast voll ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melden Dich nochmals ab und wieder an."
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Ungültiger privater Schlüssel für die Verschlüsselung-App. Bitte aktualisiere Dein privates Schlüssel-Passwort, um den Zugriff auf Deine verschlüsselten Dateien wiederherzustellen."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Deine Dateien nach wie vor verschlüsselt. Bitte gehe zu Deinen persönlichen Einstellungen, um Deine Dateien zu entschlüsseln."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} und {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Name"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Größe"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Geändert"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s konnte nicht umbenannt werden"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Hochladen (max. %s)"
@@ -342,68 +350,75 @@ msgstr "Maximale Größe für ZIP-Dateien"
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Neu"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Neue Textdatei"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Textdatei"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Neuer Ordner"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Ordner"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Gelöschte Dateien"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Lade etwas hoch!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Der Upload ist zu groß"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Scanne"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index 895dc57a81..74eeb6ed7c 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-11 01:54-0400\n"
-"PO-Revision-Date: 2014-04-10 19:00+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:02+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"
@@ -20,6 +20,166 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Lokal"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Ort"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Schlüssel"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Geheime Zeichenkette"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr "Bucket"
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr "Amazon S3 und Kompatible"
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "Zugriffsschlüssel"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Sicherheitssschlüssel"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "Host-Name (Optional)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Port (Optional)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Region (Optional)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "SSL aktivieren"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr "Pfad-Stil aktivieren"
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "App-Schlüssel"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr "Geheime Zeichenkette der App"
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Benutzername"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Passwort"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Root"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "Sicherer FTPS://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "Client-ID"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr "Geheime Zeichenkette des Client"
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr "Openstack-Objektspeicher"
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Benutzername (Erforderlich)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr "Bucket (Erforderlich)"
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr "Region (Optional für Openstack-Objektspeicher)"
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)"
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr "Mietername (Erforderlich für Openstack-Objektspeicher)"
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr "Passwort (Erforderlich für Openstack-Objektspeicher)"
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)"
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)"
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)"
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Teilen"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr "´"
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr "Benutzername als Freigabe"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "Sicherer HTTPS://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "Remote-Unterordner:"
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Zugriff gestattet"
@@ -44,29 +204,29 @@ msgstr "Fehler beim Einrichten von Google Drive"
 msgid "Saved"
 msgstr "Gespeichert"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Hinweis:</b> "
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr "und"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 "<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:626
+#: lib/config.php:623
 #, 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 "<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:628
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index dadab0a198..117b0d5c9e 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.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-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 15:50+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -22,7 +22,7 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Geteilt von {owner}"
 
@@ -62,16 +62,15 @@ msgstr "Teilen ist deaktiviert"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Für mehr Informationen, frage bitte die Person, die Dir diesen Link geschickt hat."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "Freigegeben von %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Herunterladen"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Download %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Direkter Link"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index c6285cfd76..fe8deaa636 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Konnte %s nicht dauerhaft löschen"
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Gelöschte Dateien"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Fehler"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Gelöschte Dateien"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "Wiederhergestellt"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Nichts zu löschen, der Papierkorb ist leer!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Name"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Fehler"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "Wiederhergestellt"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Nichts zu löschen, der Papierkorb ist leer!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Name"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "gelöscht"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Löschen"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index c7539f4d64..ecd64b6b16 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 16:17+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"
@@ -23,13 +23,16 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
-msgstr ""
+msgstr "Du greifst von einer nicht vertrauenswürdigen Domain auf den Server zu."
 
-#: base.php:724
-msgid "Please contact your administrator"
-msgstr ""
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr "Bitte kontaktiere Deinen Administrator. Wenn du aktuell Administrator dieser Instanz bist, konfiguriere bitte die \"trusted_domain\" - Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereit gestellt."
 
 #: private/app.php:236
 #, php-format
@@ -79,23 +82,23 @@ msgstr "Ungültiges Bild"
 msgid "web services under your control"
 msgstr "Web-Services unter Deiner Kontrolle"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -281,19 +284,19 @@ msgstr "Setze Administrator Benutzername."
 msgid "Set an admin password."
 msgstr "Setze Administrator Passwort"
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s teilte »%s« mit Dir"
@@ -301,7 +304,7 @@ msgstr "%s teilte »%s« mit Dir"
 #: private/share/share.php:498
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
+msgstr "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert"
 
 #: private/share/share.php:523
 #, php-format
@@ -335,73 +338,79 @@ msgstr "Freigabe von %s fehlgeschlagen, da die Gruppe %s nicht existiert"
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist"
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren"
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Freigabetyp %s ist nicht gültig für %s"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da das Objekt nicht gefunden wurde"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden"
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Freigabe-Backend %s nicht gefunden"
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Freigabe-Backend für %s nicht gefunden"
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s der offizielle Freigeber ist"
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Freigabe von %s fehlgeschlagen, da die Berechtigungen die erteilten Berechtigungen %s überschreiten"
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Freigabe von %s fehlgeschlagen, da das Freigabe-Backend für %s nicht in dieser Quelle gefunden werden konnte"
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr "Freigabe von %s fehlgeschlagen, da die Datei im Datei-Cache nicht gefunden werden konnte"
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Die Kategorie \"%s\" konnte nicht gefunden werden."
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 5e22f94a7e..257cd66119 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 16:17+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"
@@ -56,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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Sende-Modus"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Authentifizierungsmethode"
 
@@ -107,6 +107,16 @@ msgstr "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud.
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut."
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Verschlüsselungsschlüssel dauerhaft gelöscht"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator"
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "E-Mail Adresse gespeichert"
@@ -123,6 +133,16 @@ msgstr "Gruppe konnte nicht gelöscht werden"
 msgid "Unable to delete user"
 msgstr "Benutzer konnte nicht gelöscht werden"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Backups erfolgreich wiederhergestellt"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator"
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Sprache geändert"
@@ -178,7 +198,7 @@ msgstr "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzer
 msgid "Unable to change password"
 msgstr "Passwort konnte nicht geändert werden"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Sende..."
 
@@ -234,34 +254,42 @@ msgstr "Aktualisierung durchführen"
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Wähle ein Profilbild"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Sehr schwaches Passwort"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Schwaches Passwort"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Durchschnittliches Passwort"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Gutes Passwort"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Starkes Passwort"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Verschlüsselungsschlüssel dauerhaft löschen."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Verschlüsselungsschlüssel wiederherstellen."
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "gelöscht"
@@ -307,7 +335,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Deutsch (Persönlich)"
 
@@ -495,148 +523,143 @@ msgstr "Erlaubt Apps die Nutzung der Share-API"
 msgid "Allow links"
 msgstr "Erlaubt Links"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr "Passwortschutz erzwingen"
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Öffentliches Hochladen erlauben"
 
-#: 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:230
+msgid "Set default expiration date"
+msgstr "Setze  Ablaufdatum"
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr "Ablauf nach dem"
 
 #: templates/admin.php:235
+msgid "days"
+msgstr "Tage"
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr "Ablaufdatum erzwingen"
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen"
+
+#: templates/admin.php:252
 msgid "Allow resharing"
 msgstr "Erlaubt erneutes Teilen"
 
-#: templates/admin.php:236
+#: templates/admin.php:253
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:243
+#: templates/admin.php:260
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:246
+#: templates/admin.php:263
 msgid "Allow users to only share with users in their groups"
 msgstr "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen"
 
-#: templates/admin.php:253
+#: templates/admin.php:270
 msgid "Allow mail notification"
 msgstr "Mail-Benachrichtigung erlauben"
 
-#: templates/admin.php:254
+#: templates/admin.php:271
 msgid "Allow users to send mail notification for shared files"
 msgstr "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden"
 
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
-
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Erzwinge HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "E-Mail-Server"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Dies wird zum Senden von Benachrichtigungen verwendet."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Absender-Adresse"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Authentifizierung benötigt"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Adresse des Servers"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Zugangsdaten"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "SMTP Benutzername"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "SMTP Passwor"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Teste E-Mail-Einstellunge"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Sende E-Mail"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Loglevel"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -789,29 +812,33 @@ msgstr "Sprache"
 msgid "Help translate"
 msgstr "Hilf bei der Übersetzung"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Login-Passwort"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Alle Dateien entschlüsseln"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Deine Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Lösche diese nur dann dauerhaft, wenn Du dir sicher bist, dass alle Dateien korrekt entschlüsselt wurden."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Verschlüsselungsschlüssel wiederherstellen"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Verschlüsselungsschlüssel löschen"
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Loginname"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index abb6529ad8..b46c68bdde 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:02+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"
@@ -90,65 +90,65 @@ msgstr "Erfolgreich"
 msgid "Error"
 msgstr "Fehler"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfiguration OK"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Konfiguration nicht korrekt"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Konfiguration nicht vollständig"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Wähle Gruppen aus"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Objekt-Klassen auswählen"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Attribute auswählen"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Verbindungstest erfolgreich"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Verbindungstest fehlgeschlagen"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Möchtest Du die aktuelle Serverkonfiguration wirklich löschen?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Löschung bestätigen"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s Gruppe gefunden"
 msgstr[1] "%s Gruppen gefunden"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s Benutzer gefunden"
 msgstr[1] "%s Benutzer gefunden"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Ungültiger Host"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Konnte die gewünschte Funktion nicht finden"
 
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
index b09cbf82be..fbc4ad62d3 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -59,207 +59,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Montag"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Freitag"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Samstag"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "März"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "April"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "August"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,12 +291,12 @@ msgstr ""
 msgid "Share"
 msgstr "Freigeben"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -324,107 +324,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passwort"
-
-#: 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "Gruppe"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Teilung zurücknehmen"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -668,6 +677,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passwort"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/de_AT/files.po b/l10n/de_AT/files.po
index 6f9264ac73..3446c21302 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Freigeben"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/de_AT/files_external.po b/l10n/de_AT/files_external.po
index f838de9ba6..e63f3d2631 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: de_AT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Ort"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Passwort"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Freigeben"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/de_AT/files_sharing.po b/l10n/de_AT/files_sharing.po
index 6835f39be3..936be9ea73 100644
--- a/l10n/de_AT/files_sharing.po
+++ b/l10n/de_AT/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: de_AT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Herunterladen"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/de_AT/files_trashbin.po b/l10n/de_AT/files_trashbin.po
index 03100b293f..fb37a0f8ca 100644
--- a/l10n/de_AT/files_trashbin.po
+++ b/l10n/de_AT/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Löschen"
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/de_AT/lib.po b/l10n/de_AT/lib.po
index 12860020a3..d84ba79f96 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: de_AT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po
index 658a5dd82c..4e3cbb632b 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -99,6 +99,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -115,6 +125,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -170,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -226,34 +246,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -299,7 +327,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Deutsch (Österreich)"
 
@@ -487,148 +515,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Adresse des Servers"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +804,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/de_AT/user_ldap.po b/l10n/de_AT/user_ldap.po
index 9b848e6179..1426e0bd3e 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-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr[1] ""
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:984
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index 584e5b7af3..481fb445d7 100644
--- a/l10n/de_CH/core.po
+++ b/l10n/de_CH/core.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -68,207 +68,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Montag"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Freitag"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Samstag"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "März"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "April"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "August"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Vor %n Minute"
 msgstr[1] "Vor %n Minuten"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Vor %n Stunde"
 msgstr[1] "Vor %n Stunden"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Vor %n Tag"
 msgstr[1] "Vor %n Tagen"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Vor %n Monat"
 msgstr[1] "Vor %n Monaten"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "Vor Jahren"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Auswählen"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nein"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Auswählen"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "OK"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Neue Dateien"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Fehler"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
@@ -333,107 +333,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passwort"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Öffentliches Hochladen erlauben"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Ein Ablaufdatum setzen"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Mittels einer E-Mail teilen:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "Gruppe"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Das Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Freigegeben in {item} von {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "löschen"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Passwortgeschützt"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Email gesendet"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Warnung"
 
@@ -677,6 +686,10 @@ msgstr "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passwort"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po
index c0ac1bd869..82a9651682 100644
--- a/l10n/de_CH/files.po
+++ b/l10n/de_CH/files.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -36,7 +36,7 @@ msgstr "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert
 msgid "Could not move %s"
 msgstr "Konnte %s nicht verschieben"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Der Dateiname darf nicht leer sein."
 
@@ -45,18 +45,18 @@ msgstr "Der Dateiname darf nicht leer sein."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -148,28 +148,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Dateien"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -182,131 +186,135 @@ msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Teilen"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr ""
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Fehler"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Fehler"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Name"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Grösse"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Geändert"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] "%n Ordner"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] "%n Dateien"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n Datei wird hochgeladen"
 msgstr[1] "%n Dateien werden hochgeladen"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Name"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Grösse"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Geändert"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s konnte nicht umbenannt werden"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -343,68 +351,75 @@ msgstr "Maximale Grösse für ZIP-Dateien"
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Neu"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Textdatei"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Neues Verzeichnis"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Ordner"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Gelöschte Dateien"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Laden Sie etwas hoch!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Der Upload ist zu gross"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Scanne"
diff --git a/l10n/de_CH/files_external.po b/l10n/de_CH/files_external.po
index e1ca4b4cb2..c56ce8c325 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -18,6 +18,166 @@ msgstr ""
 "Language: de_CH\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Ort"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Benutzername"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Passwort"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Freigeben"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Zugriff gestattet"
@@ -42,29 +202,29 @@ msgstr "Fehler beim Einrichten von Google Drive"
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/de_CH/files_sharing.po b/l10n/de_CH/files_sharing.po
index 4e72d18d6a..135f8fb509 100644
--- a/l10n/de_CH/files_sharing.po
+++ b/l10n/de_CH/files_sharing.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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -20,7 +20,7 @@ msgstr ""
 "Language: de_CH\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Geteilt von {owner}"
 
@@ -60,16 +60,15 @@ msgstr "Teilen ist deaktiviert"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr ""
+#: templates/public.php:21
+msgid "Download"
+msgstr "Herunterladen"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/de_CH/files_trashbin.po b/l10n/de_CH/files_trashbin.po
index 3ef33e0c89..95b147d7c6 100644
--- a/l10n/de_CH/files_trashbin.po
+++ b/l10n/de_CH/files_trashbin.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -30,38 +30,34 @@ msgstr "Konnte %s nicht dauerhaft löschen"
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Gelöschte Dateien"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Fehler"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Gelöschte Dateien"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "Wiederhergestellt"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Nichts zu löschen, Ihr Papierkorb ist leer!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Name"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Fehler"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "Wiederhergestellt"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Nichts zu löschen, Ihr Papierkorb ist leer!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Name"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Löschen"
diff --git a/l10n/de_CH/lib.po b/l10n/de_CH/lib.po
index 6a17ffebe3..ff90110d8a 100644
--- a/l10n/de_CH/lib.po
+++ b/l10n/de_CH/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -21,12 +21,15 @@ msgstr ""
 "Language: de_CH\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -77,23 +80,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "Web-Services unter Ihrer Kontrolle"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -279,19 +282,19 @@ msgstr "Setze Administrator Benutzername."
 msgid "Set an admin password."
 msgstr "Setze Administrator Passwort"
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s teilt »%s« mit Ihnen"
@@ -333,73 +336,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Die Kategorie «%s» konnte nicht gefunden werden."
diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po
index 02d76f4488..8d3ef7d0f2 100644
--- a/l10n/de_CH/settings.po
+++ b/l10n/de_CH/settings.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -107,6 +107,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "E-Mail-Adresse gespeichert"
@@ -123,6 +133,16 @@ msgstr "Die Gruppe konnte nicht gelöscht werden"
 msgid "Unable to delete user"
 msgstr "Der Benutzer konnte nicht gelöscht werden"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Sprache geändert"
@@ -178,7 +198,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -234,34 +254,42 @@ msgstr "Update durchführen"
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "gelöscht"
@@ -307,7 +335,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Deutsch (Schweiz)"
 
@@ -495,148 +523,143 @@ msgstr "Anwendungen erlauben, die Share-API zu benutzen"
 msgid "Allow links"
 msgstr "Links erlauben"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Erlaube öffentliches hochladen"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Erlaube Weiterverteilen"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Erlaubt Benutzern, mit jedem zu teilen"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Erlaube Weiterverteilen"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Erlaubt Benutzern, mit jedem zu teilen"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "HTTPS erzwingen"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Adresse des Servers"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Log-Level"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -789,29 +812,33 @@ msgstr "Sprache"
 msgid "Help translate"
 msgstr "Helfen Sie bei der Übersetzung"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Login-Passwort"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Alle Dateien entschlüsseln"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Loginname"
diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po
index a994b7dbba..6c571700fd 100644
--- a/l10n/de_CH/user_ldap.po
+++ b/l10n/de_CH/user_ldap.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -94,65 +94,65 @@ msgstr "Erfolg"
 msgid "Error"
 msgstr "Fehler"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Wähle Gruppen"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Verbindungstest erfolgreich"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Verbindungstest fehlgeschlagen"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Löschung bestätigen"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index ef3240473e..2d92a0a8c5 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -12,15 +12,15 @@
 # Mario Siegmann <mario_siegmann@web.de>, 2013-2014
 # stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 # traductor, 2013
-# noxin <transifex.com@davidmainzer.com>, 2013
+# noxin <transifex.com@davidmainzer.com>, 2013-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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"Last-Translator: noxin <transifex.com@davidmainzer.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"
@@ -69,207 +69,207 @@ msgstr "Kein temporäres Profilbild verfügbar, bitte versuchen Sie es nochmal"
 msgid "No crop data provided"
 msgstr "Keine Zuschnittdaten zur Verfügung gestellt"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Montag"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Freitag"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Samstag"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "März"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "April"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "August"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Vor %n Minute"
 msgstr[1] "Vor %n Minuten"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Vor %n Stunde"
 msgstr[1] "Vor %n Stunden"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Vor %n Tag"
 msgstr[1] "Vor %n Tagen"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Vor %n Monat"
 msgstr[1] "Vor %n Monaten"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "Vor Jahren"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Auswählen"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nein"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Auswählen"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "OK"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} Dateikonflikt"
 msgstr[1] "{count} Dateikonflikte"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Ein Dateikonflikt"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Neue Dateien"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Die Dateien existieren bereits"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Welche Dateien möchten Sie behalten?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Fortsetzen"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(Alle ausgewählt)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} ausgewählt)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Fehler beim Laden der vorhanden Dateivorlage"
 
@@ -301,12 +301,12 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Fehler"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
@@ -334,107 +334,116 @@ msgstr "Mit Benutzer oder Gruppe teilen ...."
 msgid "Share link"
 msgstr "Link teilen"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen"
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr "Standardmäßig wird der öffentliche Link nach {days} Tagen ablaufen"
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passwort"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr "Wählen Sie ein Passwort für den öffentlichen Link"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Öffentliches Hochladen erlauben"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Ein Ablaufdatum setzen"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Mittels einer E-Mail teilen:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "Gruppe"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Das Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Freigegeben in {item} von {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "Per E-Mail informieren"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "löschen"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Passwortgeschützt"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Email gesendet"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Warnung"
 
@@ -678,6 +687,10 @@ msgstr "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>,
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passwort"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Speicher & Datenbank"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 398d697544..133cd08a15 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -11,16 +11,16 @@
 # Mario Siegmann <mario_siegmann@web.de>, 2013-2014
 # stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 # traductor, 2013
-# noxin <transifex.com@davidmainzer.com>, 2013
+# noxin <transifex.com@davidmainzer.com>, 2013-2014
 # Mirodin <blobbyjj@ymail.com>, 2013
 # kabum <uu.kabum@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"Last-Translator: noxin <transifex.com@davidmainzer.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"
@@ -38,7 +38,7 @@ msgstr "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert
 msgid "Could not move %s"
 msgstr "Konnte %s nicht verschieben"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Der Dateiname darf nicht leer sein."
 
@@ -47,18 +47,18 @@ msgstr "Der Dateiname darf nicht leer sein."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" ist kein gültiger Dateiname."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Der Ziel-Ordner wurde verschoben oder gelöscht."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -150,28 +150,32 @@ msgstr "Hochladen fehlgeschlagen. Die Dateiinformationen konnten nicht abgerufen
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Dateien"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Alle Dateien"
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 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:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Ergebnis konnte nicht vom Server abgerufen werden."
 
@@ -184,131 +188,135 @@ msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload
 msgid "URL cannot be empty"
 msgstr "Die URL darf nicht leer sein"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Die Datei konnte nicht erstellt werden"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Der Ordner konnte nicht erstellt werden"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Fehler beim Abrufen der URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Teilen"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Fehler beim Verschieben der Datei"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Fehler"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Fehler beim Verschieben der Datei."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Fehler beim Verschieben der Datei"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Fehler"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Die Datei konnte nicht umbenannt werden"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Fehler beim Löschen der Datei."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Name"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Größe"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Geändert"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n Ordner"
 msgstr[1] "%n Ordner"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n Datei"
 msgstr[1] "%n Dateien"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} und {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n Datei wird hoch geladen"
 msgstr[1] "%n Dateien werden hoch geladen"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" ist kein gültiger Dateiname."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden sich nochmals ab und wieder an."
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Ungültiger privater Schlüssel für die Verschlüsselung-App. Bitte aktualisieren Sie Ihr privates Schlüssel-Passwort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} und {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Name"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Größe"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Geändert"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s konnte nicht umbenannt werden"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Hochladen (max. %s)"
@@ -345,68 +353,75 @@ msgstr "Maximale Größe für ZIP-Dateien"
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Neu"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Neue Textdatei"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Textdatei"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Neuer Ordner"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Ordner"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Gelöschte Dateien"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Laden Sie etwas hoch!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Der Upload ist zu groß"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Scanne"
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index 214a786b82..b7a5e8005b 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-11 01:54-0400\n"
-"PO-Revision-Date: 2014-04-10 18:50+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:02+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"
@@ -21,6 +21,166 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Lokal"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Ort"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Schlüssel"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Geheime Zeichenkette"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr "Bucket"
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr "Amazon S3 und Kompatible"
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "Zugriffsschlüssel"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Sicherheitsschlüssel"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "Host-Name (Optional)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Port (Optional)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Region (Optional)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "SSL aktivieren"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr "Pfad-Stil aktivieren"
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "App-Schlüssel"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr "Geheime Zeichenkette der App"
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Benutzername"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Passwort"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Root"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "Sicherer FTPS://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "Client-ID"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr "Geheime Zeichenkette des Client"
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr "Openstack-Objektspeicher"
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Benutzername (Erforderlich)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr "Bucket (Erforderlich)"
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr "Region (Optional für Openstack-Objektspeicher)"
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)"
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr "Mietername (Erforderlich für Openstack-Objektspeicher)"
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr "Passwort (Erforderlich für Openstack-Objektspeicher)"
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)"
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)"
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)"
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Teilen"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)"
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr "Benutzername als Freigabe"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "Sicherer HTTPS://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "Remote-Unterordner:"
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Zugriff gestattet"
@@ -45,29 +205,29 @@ msgstr "Fehler beim Einrichten von Google Drive"
 msgid "Saved"
 msgstr "Gespeichert"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Hinweis:</b> "
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr "und"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 "<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:626
+#: lib/config.php:623
 #, 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 "<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:628
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index fc0d2176be..7db89711eb 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.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 22:00+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -21,7 +21,7 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Geteilt von {owner}"
 
@@ -61,16 +61,15 @@ msgstr "Teilen ist deaktiviert"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "Geteilt von %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Herunterladen"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Download %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Direkte Verlinkung"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index 4eced02e01..5a3604768f 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
@@ -29,38 +29,34 @@ msgstr "Konnte %s nicht dauerhaft löschen"
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Gelöschte Dateien"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Fehler"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Gelöschte Dateien"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "Wiederhergestellt"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Nichts zu löschen, Ihr Papierkorb ist leer!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Name"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Fehler"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "Wiederhergestellt"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Nichts zu löschen, Ihr Papierkorb ist leer!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Name"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Löschen"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 4b4f75e1af..790bbb1b0e 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -7,15 +7,15 @@
 # Mario Siegmann <mario_siegmann@web.de>, 2013-2014
 # stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 # traductor, 2013
-# noxin <transifex.com@davidmainzer.com>, 2013
+# noxin <transifex.com@davidmainzer.com>, 2013-2014
 # 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 16:17+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"
@@ -23,13 +23,16 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
-msgstr ""
+msgstr "Sie greifen von einer nicht vertrauenswürdigen Domain auf den Server zu."
 
-#: base.php:724
-msgid "Please contact your administrator"
-msgstr ""
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr "Bitte kontaktieren Sie Ihren Administrator. Wenn Sie aktuell Administrator dieser Instanz sind, konfigurieren Sie bitte die \"trusted_domain\" - Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereit gestellt."
 
 #: private/app.php:236
 #, php-format
@@ -79,23 +82,23 @@ msgstr "Ungültiges Bild"
 msgid "web services under your control"
 msgstr "Web-Services unter Ihrer Kontrolle"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -281,19 +284,19 @@ msgstr "Setze Administrator Benutzername."
 msgid "Set an admin password."
 msgstr "Setze Administrator Passwort"
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s hat »%s« mit Ihnen geteilt"
@@ -301,7 +304,7 @@ msgstr "%s hat »%s« mit Ihnen geteilt"
 #: private/share/share.php:498
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
+msgstr "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert"
 
 #: private/share/share.php:523
 #, php-format
@@ -335,73 +338,79 @@ msgstr "Freigabe von %s fehlgeschlagen, da die Gruppe %s nicht existiert"
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist"
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren"
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Freigabetyp %s ist nicht gültig für %s"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da das Objekt nicht gefunden wurde"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden"
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Freigabe-Backend %s nicht gefunden"
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Freigabe-Backend für %s nicht gefunden"
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s der offizielle Freigeber ist"
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Freigabe von %s fehlgeschlagen, da die Berechtigungen die erteilten Berechtigungen %s überschreiten"
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Freigabe von %s fehlgeschlagen, da das Freigabe-Backend für %s nicht in dieser Quelle gefunden werden konnte"
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr "Freigabe von %s fehlgeschlagen, da die Datei im Datei-Cache nicht gefunden werden konnte"
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Die Kategorie \"%s\" konnte nicht gefunden werden."
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 6bb522f389..d34fe672e9 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -4,21 +4,22 @@
 # 
 # Translators:
 # a.tangemann <a.tangemann@web.de>, 2013
+# montolio <montolio@gmx.at>, 2014
 # arkascha <foss@christian-reiner.info>, 2013
 # I Robot, 2014
 # Mario Siegmann <mario_siegmann@web.de>, 2013-2014
 # stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 # traductor, 2013
-# noxin <transifex.com@davidmainzer.com>, 2013
+# noxin <transifex.com@davidmainzer.com>, 2013-2014
 # Mirodin <blobbyjj@ymail.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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"Last-Translator: noxin <transifex.com@davidmainzer.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 +57,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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Sende-Modus"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Authentifizierungsmethode"
 
@@ -107,6 +108,16 @@ msgstr "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre ownc
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut."
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Verschlüsselungsschlüssel dauerhaft gelöscht"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfen Sie bitte Ihre owncloud.log oder frage Deinen Administrator"
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "E-Mail-Adresse gespeichert"
@@ -123,6 +134,16 @@ msgstr "Die Gruppe konnte nicht gelöscht werden"
 msgid "Unable to delete user"
 msgstr "Der Benutzer konnte nicht gelöscht werden"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Backups erfolgreich wiederhergestellt"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator"
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Sprache geändert"
@@ -178,7 +199,7 @@ msgstr "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzer
 msgid "Unable to change password"
 msgstr "Passwort konnte nicht geändert werden"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Sende..."
 
@@ -234,34 +255,42 @@ msgstr "Update durchführen"
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Wählen Sie ein Profilbild"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Sehr schwaches Passwort"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Schwaches Passwort"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Passables Passwort"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Gutes Passwort"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Starkes Passwort"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Verschlüsselungsschlüssel dauerhaft löschen."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Verschlüsselungsschlüssel wiederherstellen."
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "gelöscht"
@@ -307,7 +336,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Deutsch (Förmlich: Sie)"
 
@@ -495,148 +524,143 @@ msgstr "Anwendungen erlauben, die Share-API zu benutzen"
 msgid "Allow links"
 msgstr "Links erlauben"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr "Passwortschutz erzwingen"
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Öffentliches Hochladen erlauben"
 
-#: 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:230
+msgid "Set default expiration date"
+msgstr "Setze  Ablaufdatum"
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr "Ablauf nach dem"
 
 #: templates/admin.php:235
+msgid "days"
+msgstr "Tage"
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr "Ablaufdatum erzwingen"
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
+
+#: templates/admin.php:252
 msgid "Allow resharing"
 msgstr "Erlaube Weiterverteilen"
 
-#: templates/admin.php:236
+#: templates/admin.php:253
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:243
+#: templates/admin.php:260
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:246
+#: templates/admin.php:263
 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:253
+#: templates/admin.php:270
 msgid "Allow mail notification"
 msgstr "Mail-Benachrichtigung erlauben"
 
-#: templates/admin.php:254
+#: templates/admin.php:271
 msgid "Allow users to send mail notification for shared files"
 msgstr "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden"
 
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
-
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "HTTPS erzwingen"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "E-Mail-Server"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Dies wird für das Senden von Benachrichtigungen verwendet."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Absender-Adresse"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Authentifizierung benötigt"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Adresse des Servers"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Zugangsdaten"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "SMTP Benutzername"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "SMTP Passwort"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "E-Mail-Einstellungen testen"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "E-Mail senden"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Log-Level"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -789,29 +813,33 @@ msgstr "Sprache"
 msgid "Help translate"
 msgstr "Helfen Sie bei der Übersetzung"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Login-Passwort"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Alle Dateien entschlüsseln"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Ihre Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Löschen Sie diese nur dann dauerhaft, wenn Sie sich sicher sind, dass alle Dateien korrekt entschlüsselt wurden."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Verschlüsselungsschlüssel wiederherstellen"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Verschlüsselungsschlüssel löschen"
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Loginname"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 52e75e4172..56d23e1aa8 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:02+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"
@@ -92,65 +92,65 @@ msgstr "Erfolg"
 msgid "Error"
 msgstr "Fehler"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfiguration OK"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Konfiguration nicht korrekt"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Konfiguration nicht vollständig"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Wähle Gruppen"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Objekt-Klassen auswählen"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Attribute auswählen"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Verbindungstest erfolgreich"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Verbindungstest fehlgeschlagen"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Löschung bestätigen"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s Gruppe gefunden"
 msgstr[1] "%s Gruppen gefunden"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s Benutzer gefunden"
 msgstr[1] "%s Benutzer gefunden"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Ungültiger Host"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Konnte die gewünschte Funktion nicht finden"
 
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 8b2799cf50..01882b4c69 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -69,207 +69,207 @@ msgstr "Δεν υπάρχει προσωρινή φωτογραφία προφί
 msgid "No crop data provided"
 msgstr "Δεν δόθηκαν δεδομένα περικοπής"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Κυριακή"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Δευτέρα"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Τρίτη"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Πέμπτη"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Παρασκευή"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Ιανουάριος"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Μάρτιος"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Απρίλιος"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Μάϊος"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Ιούνιος"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Ιούλιος"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Αύγουστος"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Οκτώβριος"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Νοέμβριος"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Δεκέμβριος"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Γίνεται αποθήκευση..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "δευτερόλεπτα πριν"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n λεπτό πριν"
 msgstr[1] "%n λεπτά πριν"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n ώρα πριν"
 msgstr[1] "%n ώρες πριν"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "σήμερα"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "χτες"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n ημέρα πριν"
 msgstr[1] "%n ημέρες πριν"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "τελευταίο μήνα"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n μήνας πριν"
 msgstr[1] "%n μήνες πριν"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "τελευταίο χρόνο"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "χρόνια πριν"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Επιλέξτε"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Ναι"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Όχι"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Επιλέξτε"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Οκ"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Σφάλμα φόρτωσης προτύπου μηνυμάτων: {σφάλμα}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} αρχείο διαφέρει"
 msgstr[1] "{count} αρχεία διαφέρουν"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Ένα αρχείο διαφέρει"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Νέα Αρχεία"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
-msgstr ""
+msgstr "Ήδη υπάρχοντα αρχεία"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Ποια αρχεία θέλετε να κρατήσετε;"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Εάν επιλέξετε και τις δυο εκδοχές, ένας αριθμός θα προστεθεί στο αντιγραφόμενο αρχείο."
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Συνέχεια"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(όλα τα επιλεγμένα)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} επιλέχθησαν)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Σφάλμα κατά την φόρτωση του προτύπου ύπαρξης αρχείου"
 
@@ -301,12 +301,12 @@ msgstr "Κοινόχρηστα"
 msgid "Share"
 msgstr "Διαμοιρασμός"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Σφάλμα κατά τον διαμοιρασμό"
 
@@ -334,107 +334,116 @@ msgstr "Διαμοιρασμός με χρήστη ή ομάδα ..."
 msgid "Share link"
 msgstr "Διαμοιρασμός συνδέσμου"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του"
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί ερήμην μετά από {days} ημέρες"
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Προστασία συνθηματικού"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Συνθηματικό"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Επιτρέπεται η Δημόσια Αποστολή"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Αποστολή συνδέσμου με email "
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Αποστολή"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Ορισμός ημ. λήξης"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Ημερομηνία λήξης"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Διαμοιρασμός μέσω email:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Δεν βρέθηκε άνθρωπος"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "ομάδα"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Ξαναμοιρασμός δεν επιτρέπεται"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Διαμοιρασμός του {item} με τον {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Διακοπή διαμοιρασμού"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "ειδοποίηση με email"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "δυνατότητα αλλαγής"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "έλεγχος πρόσβασης"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "δημιουργία"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "ενημέρωση"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "διαγραφή"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "διαμοιρασμός"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Προστασία με συνθηματικό"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Σφάλμα κατά την διαγραφή της ημ. λήξης"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Σφάλμα κατά τον ορισμό ημ. λήξης"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Αποστολή..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Το Email απεστάλη "
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
@@ -678,6 +687,10 @@ msgstr "Για πληροφορίες πως να ρυθμίσετε ορθά τ
 msgid "Create an <strong>admin account</strong>"
 msgstr "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Συνθηματικό"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Αποθήκευση & βάση δεδομένων"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 3e69546331..93f75d3569 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -6,6 +6,7 @@
 # Efstathios Iosifidis <iefstathios@gmail.com>, 2013-2014
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
 # gtsamis <gtsamis@yahoo.com>, 2013
+# ggoniotakis <ioannis.goniotakis@gmail.com>, 2014
 # frerisp <petrosfreris@gmail.com>, 2013
 # pe_ppe <peppe@cs.uoi.gr>, 2014
 # vkehayas <vkehayas@gmail.com>, 2013
@@ -14,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -34,7 +35,7 @@ msgstr "Αδυναμία μετακίνησης του %s - υπάρχει ήδ
 msgid "Could not move %s"
 msgstr "Αδυναμία μετακίνησης του %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Το όνομα αρχείου δεν μπορεί να είναι κενό."
 
@@ -43,18 +44,18 @@ msgstr "Το όνομα αρχείου δεν μπορεί να είναι κε
 msgid "\"%s\" is an invalid file name."
 msgstr "Το \"%s\" είναι ένα μη έγκυρο όνομα αρχείου."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Ο φάκελος προορισμού έχει μετακινηθεί ή διαγραφεί."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -146,28 +147,32 @@ msgstr "Η φόρτωση απέτυχε. Αδυναμία λήψης πληρο
 msgid "Invalid directory."
 msgstr "Μη έγκυρος φάκελος."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Αρχεία"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Αδυναμία φόρτωσης {filename} καθώς είναι κατάλογος αρχείων ή έχει 0 bytes"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Το συνολικό μέγεθος αρχείου {size1} υπερβαίνει το όριο μεταφόρτωσης {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr "Δεν υπάρχει αρκετός ελεύθερος χώρος, μεταφορτώνετε μέγεθος {size1} αλλά υπάρχει χώρος μόνο {size2}"
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Η αποστολή ακυρώθηκε."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Αδυναμία λήψης αποτελέσματος από το διακομιστή."
 
@@ -180,134 +185,138 @@ msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέ
 msgid "URL cannot be empty"
 msgstr "Η URL δεν πρέπει να είναι κενή"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} υπάρχει ήδη"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Αδυναμία δημιουργίας αρχείου"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Αδυναμία δημιουργίας φακέλου"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Σφάλμα φόρτωσης URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Διαμοιρασμός"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Μόνιμη διαγραφή"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Σφάλμα κατά τη μετακίνηση του αρχείου"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος."
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Σφάλμα"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Εκκρεμεί"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Σφάλμα κατά τη μετακίνηση του αρχείου."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Σφάλμα κατά τη μετακίνηση του αρχείου"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Αδυναμία μετονομασίας αρχείου"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Σφάλμα διαγραφής αρχείου."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Όνομα"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Μέγεθος"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Τροποποιήθηκε"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n φάκελος"
 msgstr[1] "%n φάκελοι"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n αρχείο"
 msgstr[1] "%n αρχεία"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{Κατάλογοι αρχείων} και {αρχεία}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Ανέβασμα %n αρχείου"
 msgstr[1] "Ανέβασμα %n αρχείων"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "Το \"{name}\" είναι μη έγκυρο όνομα αρχείου."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Ο αποθηκευτικός σας χώρος είναι γεμάτος, τα αρχεία δεν μπορούν να ενημερωθούν ή να συγχρονιστούν πια!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε."
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις"
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
-msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{Κατάλογοι αρχείων} και {αρχεία}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Όνομα"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Μέγεθος"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Τροποποιήθηκε"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "Αδυναμία μετονομασίας του %s"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
-msgstr ""
+msgstr "Διαμοιρασμός (max. %s)"
 
 #: templates/admin.php:4
 msgid "File handling"
@@ -341,68 +350,75 @@ msgstr "Μέγιστο μέγεθος για αρχεία ZIP"
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Νέο"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Νέο αρχείο κειμένου"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Αρχείο κειμένου"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Νέος κατάλογος"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Φάκελος"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Από σύνδεσμο"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Διαγραμμένα αρχεία"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Ακύρωση αποστολής"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr "Δεν έχετε δικαιώματα φόρτωσης ή δημιουργίας αρχείων εδώ"
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Πολύ μεγάλο αρχείο προς αποστολή"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή."
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Τρέχουσα ανίχνευση"
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index 8ffa802692..ad919e8338 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# thea_rad <inactive+thea_rad@transifex.com>, 2014
+# ggoniotakis <ioannis.goniotakis@gmail.com>, 2014
 # 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -19,6 +21,166 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Τοπικός"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Τοποθεσία"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Κλειδί"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Μυστικό"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "Κλειδί πρόσβασης"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Μυστικό κλειδί"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "Όνομα μηχανήματος (προαιρετικά)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Πόρτα (προαιρετικά)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Περιοχή (προαιρετικά)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Ενεργοποίηση SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr "Ενεργοποίηση μορφής διαδρομής"
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "Κλειδί εφαρμογής"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Διακομιστής"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Όνομα χρήστη"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Κωδικός πρόσβασης"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Root"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "Ασφαλής ftps://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "ID πελάτη"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr "Μυστικό πελάτη"
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr "Αποθήκη αντικειμένων OpenStack"
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Όνομα χρήστη (απαιτείται)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr "Περιοχή (προαιρετικά για την αποθήκευση αντικειμένων OpenStack)"
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr "Κλειδί API (απαιτείται για αρχεία Rackspace Cloud)"
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμένων OpenStack)"
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr "Όνομα υπηρεσίας (απαιτείται για την αποθήκευση αντικειμένων OpenStack)"
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr "Διεύθυνση URL της ταυτότητας τελικού σημείου (απαιτείται για την αποθήκευση αντικειμένων OpenStack)"
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr "Χρονικό όριο των αιτήσεων HTTP σε δευτερόλεπτα (προαιρετικά)"
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Διαμοιράστε"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr "SMB / CIFS χρησιμοποιώντας λογαριασμό OC"
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "Ασφαλής σύνδεση https://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "Απομακρυσμένος υποφάκελος"
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Προσβαση παρασχέθηκε"
@@ -43,34 +205,34 @@ msgstr "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive "
 msgid "Saved"
 msgstr "Αποθηκεύτηκαν"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>Σημείωση:</b> "
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
-msgstr ""
+msgstr "και"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 ""
+msgstr "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει."
 
-#: lib/config.php:626
+#: lib/config.php:623
 #, 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 ""
+msgstr "<b>Σημείωση:</b> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει."
 
-#: lib/config.php:628
+#: lib/config.php:625
 #, 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 ""
+msgstr "<b>Σημείωση:</b> Η επέκταση \"%s\" δεν είναι εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει."
 
 #: templates/settings.php:2
 msgid "External Storage"
@@ -94,7 +256,7 @@ msgstr "Επιλογές"
 
 #: templates/settings.php:12
 msgid "Available for"
-msgstr ""
+msgstr "Διαθέσιμο για"
 
 #: templates/settings.php:32
 msgid "Add storage"
@@ -102,7 +264,7 @@ msgstr "Προσθηκη αποθηκευσης"
 
 #: templates/settings.php:92
 msgid "No user or group"
-msgstr ""
+msgstr "Μη διαθέσιμος χρήστης ή ομάδα"
 
 #: templates/settings.php:95
 msgid "All Users"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 4d08fedac3..975eb5d01d 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 15:47+0000\n"
-"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -20,7 +20,7 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Διαμοιράστηκε από τον {owner}"
 
@@ -60,16 +60,15 @@ msgstr "ο διαμοιρασμός απενεργοποιήθηκε"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Για περισσότερες πληροφορίες, παρακαλώ ρωτήστε το άτομο που σας έστειλε αυτόν τον σύνδεσμο."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "διαμοιράστηκε από %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Λήψη"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Λήψη %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Άμεσος σύνδεσμος"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index c8d33b1aa1..384bfe32c1 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -29,38 +29,34 @@ msgstr "Αδύνατη η μόνιμη διαγραφή του %s"
 msgid "Couldn't restore %s"
 msgstr "Αδυναμία επαναφοράς %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "Όνομα"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Επαναφορά"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "επαναφέρθηκαν"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Όνομα"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Διαγραμμένα"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Διαγραφή"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index 7cf1c93e42..f2599b0c55 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -22,13 +22,16 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
-msgstr ""
+msgstr "Η προσπέλαση του διακομιστή γίνεται από μη έμπιστο τομέα."
 
-#: base.php:724
-msgid "Please contact your administrator"
-msgstr ""
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr "Παρακαλώ επικοινωνήστε με τον διαχειριστή συστημάτων σας. Αν είστε διαχειριστής αυτού του στιγμιοτύπο, ρυθμίστε το κλειδί \"trusted_domain\" στο αρχείο config/config.php. Ένα παράδειγμα παρέχεται στο αρχείο config/config.sample.php."
 
 #: private/app.php:236
 #, php-format
@@ -78,23 +81,23 @@ msgstr "Μη έγκυρη εικόνα"
 msgid "web services under your control"
 msgstr "υπηρεσίες δικτύου υπό τον έλεγχό σας"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Η λήψη ZIP απενεργοποιήθηκε."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Τα αρχεία πρέπει να ληφθούν ένα-ένα."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Πίσω στα Αρχεία"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -280,19 +283,19 @@ msgstr "Εισάγετε όνομα χρήστη διαχειριστή."
 msgid "Set an admin password."
 msgstr "Εισάγετε συνθηματικό διαχειριστή."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>."
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "Ο %s διαμοιράστηκε μαζί σας το »%s«"
@@ -300,107 +303,113 @@ msgstr "Ο %s διαμοιράστηκε μαζί σας το »%s«"
 #: private/share/share.php:498
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
+msgstr "Ο διαμοιρασμός του %s απέτυχε, γιατί το αρχείο δεν υπάρχει"
 
 #: private/share/share.php:523
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
-msgstr ""
+msgstr "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s είναι ο ιδιοκτήτης του αντικειμένου"
 
 #: private/share/share.php:529
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
-msgstr ""
+msgstr "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν υπάρχει"
 
 #: private/share/share.php:538
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
-msgstr ""
+msgstr "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν είναι μέλος καμίας ομάδας στην οποία ο χρήστης %s είναι μέλος"
 
 #: private/share/share.php:551 private/share/share.php:579
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
-msgstr ""
+msgstr "Ο διαμοιρασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοιρασμένο ήδη με τον χρήστη %s"
 
 #: private/share/share.php:559
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
-msgstr ""
+msgstr "Ο διαμοιρασμός του %s απέτυχε, γιατί η ομάδα χρηστών %s δεν υπάρχει"
 
 #: private/share/share.php:566
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν είναι μέλος της ομάδας %s"
+
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
-msgstr ""
+msgstr "Ο διαμοιρασμός του %s απέτυχε, γιατί δεν επιτρέπεται ο διαμοιρασμός με συνδέσμους"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
-msgstr ""
+msgstr "Ο τύπος διαμοιρασμού %s δεν είναι έγκυρος για το %s"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
-msgstr ""
+msgstr "Ο ορισμός δικαιωμάτων για το %s απέτυχε, γιατί τα δικαιώματα υπερτερούν αυτά που είναι ορισμένα για το %s"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
-msgstr ""
+msgstr "Ο ορισμός δικαιωμάτων για το %s απέτυχε, γιατί το αντικείμενο δεν βρέθηκε"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
-msgstr ""
+msgstr "Το σύστημα διαμοιρασμού %s πρέπει να υλοποιεί την διεπαφή OCP\\Share_Backend"
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
-msgstr ""
+msgstr "Το σύστημα διαμοιρασμού %s δεν βρέθηκε"
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
-msgstr ""
+msgstr "Το σύστημα διαμοιρασμού για το %s δεν βρέθηκε"
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
-msgstr ""
+msgstr "Ο διαμοιρασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοιρασμένο αρχικά από τον χρήστη %s"
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
-msgstr ""
+msgstr "Ο διαμοιρασμός του %s απέτυχε, γιατί τα δικαιώματα υπερτερούν αυτά που είναι ορισμένα για το %s"
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
-msgstr ""
+msgstr "Ο διαμοιρασμός του %s απέτυχε, γιατί δεν επιτρέπεται ο επαναδιαμοιρασμός"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
-msgstr ""
+msgstr "Ο διαμοιρασμός του %s απέτυχε, γιατί δεν ήταν δυνατό να εντοπίσει την πηγή το σύστημα διαμοιρασμού για το %s "
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
-msgstr ""
+msgstr "Ο διαμοιρασμός του %s απέτυχε, γιατί το αρχείο δεν βρέθηκε στην προσωρινή αποθήκευση αρχείων"
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Αδυναμία εύρεσης κατηγορίας \"%s\""
@@ -457,7 +466,7 @@ msgstr "χρόνια πριν"
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "Μόνο οι παρακάτων χαρακτήρες επιτρέπονται σε ένα όνομα χρήστη: \"a-z\", \"A-Z\", \"0-9\" και \"_.@-\""
 
 #: private/user/manager.php:237
 msgid "A valid username must be provided"
@@ -469,4 +478,4 @@ msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
 
 #: private/user/manager.php:246
 msgid "The username is already being used"
-msgstr ""
+msgstr "Το όνομα χρήστη είναι κατειλημμένο"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 4094ea648c..a6813963ad 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -56,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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Κατάσταση αποστολής"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Κρυπτογράφηση"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Μέθοδος πιστοποίησης"
 
@@ -95,17 +95,27 @@ msgstr "Αδυναμία προσθήκης ομάδας"
 
 #: ajax/decryptall.php:31
 msgid "Files decrypted successfully"
-msgstr ""
+msgstr "Τα αρχεία αποκρυπτογραφήθηκαν με επιτυχία"
 
 #: ajax/decryptall.php:33
 msgid ""
 "Couldn't decrypt your files, please check your owncloud.log or ask your "
 "administrator"
-msgstr ""
+msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων, παρακαλώ ελέγξτε το owncloud.log ή ενημερωθείτε από τον διαχειριστή συστημάτων σας"
 
 #: ajax/decryptall.php:36
 msgid "Couldn't decrypt your files, check your password and try again"
-msgstr ""
+msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων σας, ελέγξτε τον κωδικό πρόσβασής σας και δοκιμάστε πάλι"
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Τα κλειδιά κρυπτογράφησης αφαιρέθηκαν οριστικά"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Δεν ήταν δυνατή η οριστική διαγραφή των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας"
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
@@ -123,6 +133,16 @@ msgstr "Αδυναμία διαγραφής ομάδας"
 msgid "Unable to delete user"
 msgstr "Αδυναμία διαγραφής χρήστη"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Η επαναφορά αντιγράφων ασφαλείας έγινε με επιτυχία"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Δεν ήταν δυνατή η επαναφορά των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας"
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Η γλώσσα άλλαξε"
@@ -178,7 +198,7 @@ msgstr "Το βασικό πλαίσιο δεν υποστηρίζει αλλα
 msgid "Unable to change password"
 msgstr "Αδυναμία αλλαγής συνθηματικού"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Αποστέλεται..."
 
@@ -234,34 +254,42 @@ msgstr "Ενημέρωση"
 msgid "Updated"
 msgstr "Ενημερώθηκε"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Επιλογή εικόνας προφίλ"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Πολύ αδύναμο συνθηματικό"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Αδύναμο συνθηματικό"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Μέτριο συνθηματικό"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Καλό συνθηματικό"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Δυνατό συνθηματικό"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "διαγράφηκε"
@@ -307,7 +335,7 @@ msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Προειδοποίηση: Ο μητρικός κατάλογος του χρήστη \"{user}\" υπάρχει ήδη"
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__όνομα_γλώσσας__"
 
@@ -495,148 +523,143 @@ msgstr "Επιτρέπει την χρήση του API διαμοιρασμού
 msgid "Allow links"
 msgstr "Επιτρέπονται οι σύνδεσμοι"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Επιτρέπει τους χρήστες να διαμοιράζουν δημόσια με συνδέσμους"
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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:230
+msgid "Set default expiration date"
+msgstr "Ορισμός ερήμην ημερομηνίας λήξης"
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr "Λήξη μετά από"
 
 #: templates/admin.php:235
+msgid "days"
+msgstr "ημέρες"
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr "Επιβολή της ημερομηνίας λήξης"
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Επιτρέπει τους χρήστες να διαμοιράζουν δημόσια με συνδέσμους"
+
+#: templates/admin.php:252
 msgid "Allow resharing"
 msgstr "Επιτρέπεται ο επαναδιαμοιρασμός"
 
-#: templates/admin.php:236
+#: templates/admin.php:253
 msgid "Allow users to share items shared with them again"
 msgstr "Επιτρέπει στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί"
 
-#: templates/admin.php:243
+#: templates/admin.php:260
 msgid "Allow users to share with anyone"
 msgstr "Επιτρέπεται στους χρήστες ο διαμοιρασμός με οποιονδήποτε"
 
-#: templates/admin.php:246
+#: templates/admin.php:263
 msgid "Allow users to only share with users in their groups"
 msgstr "Επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας"
 
-#: templates/admin.php:253
+#: templates/admin.php:270
 msgid "Allow mail notification"
 msgstr "Επιτρέπονται ειδοποιήσεις ηλεκτρονικού ταχυδρομείου"
 
-#: templates/admin.php:254
+#: templates/admin.php:271
 msgid "Allow users to send mail notification for shared files"
-msgstr ""
+msgstr "Επιτρέψτε στους χρήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία"
 
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
-
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Ασφάλεια"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Επιβολή χρήσης HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Επιβάλλει τους πελάτες να συνδέονται στο %s μέσω κρυπτογραφημένης σύνδεσης."
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Παρακαλώ συνδεθείτε στο %s σας μέσω HTTPS για να ενεργοποιήσετε ή να απενεργοποιήσετε την επιβολή του SSL."
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "Διακομιστής Email"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Χρησιμοποιείται για αποστολή ειδοποιήσεων."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Από τη διεύθυνση"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Απαιτείται πιστοποίηση"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Διεύθυνση διακομιστή"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Θύρα"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Πιστοποιητικά"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "Όνομα χρήστη SMTP"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "Συνθηματικό SMTP"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Δοκιμή ρυθμίσεων email"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Αποστολή email"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Καταγραφές"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Επίπεδο καταγραφής"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Περισσότερα"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Λιγότερα"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Έκδοση"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -789,29 +812,33 @@ msgstr "Γλώσσα"
 msgid "Help translate"
 msgstr "Βοηθήστε στη μετάφραση"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Η εφαρμογή κρυπτογράφησης δεν είναι πλέον ενεργοποιημένη, παρακαλώ αποκρυπτογραφήστε όλα τα αρχεία σας"
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Συνθηματικό εισόδου"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Αποκρυπτογράφηση όλων των Αρχείων"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Τα κλειδιά κρυπτογράφησής σας μεταφέρονται σε θέση αντιγράφου ασφαλείας. Αν κάτι πάει στραβά, μπορείτε να τα επαναφέρετε. Διαγράψτε τα οριστικά μόνο αν είστε βέβαιοι ότι όλα τα αρχεία αποκρυπτογραφήθηκαν σωστά."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Επαναφορά κλειδιών κρυπτογράφησης"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Διαγραφή κλειδιών κρυπτογράφησης"
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Όνομα Σύνδεσης"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 59c79d16b9..24f2577618 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -89,65 +89,65 @@ msgstr "Επιτυχία"
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Η διαμόρφωση είναι εντάξει"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Η διαμόρφωση είναι λανθασμένη"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Η διαμόρφωση είναι ελλιπής"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Επιλέξτε ομάδες"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Επιλογή κλάσης αντικειμένων"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Επιλογή χαρακτηριστικών"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Επιτυχημένη δοκιμαστική σύνδεση"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Αποτυχημένη δοκιμαστική σύνδεσης."
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Επιβεβαίωση Διαγραφής"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s ομάδα βρέθηκε"
 msgstr[1] "%s ομάδες βρέθηκαν"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s χρήστης βρέθηκε"
 msgstr[1] "%s χρήστες βρέθηκαν"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Άκυρος εξυπηρετητής"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Αδυναμία εύρεσης επιθυμητου χαρακτηριστικού"
 
@@ -339,7 +339,7 @@ msgstr "Σύνδεση μόνο με το διακομιστή-αντίγραφ
 
 #: templates/settings.php:26
 msgid "Case insensitive LDAP server (Windows)"
-msgstr ""
+msgstr "Διακομιστής LDAP με διάκριση πεζών-κεφαλαίων (Windows)"
 
 #: templates/settings.php:27
 msgid "Turn off SSL certificate validation."
@@ -424,14 +424,14 @@ msgstr ""
 
 #: templates/settings.php:40
 msgid "Paging chunksize"
-msgstr ""
+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 ""
+msgstr "Μέγεθος τμήματος που χρησιμοποιείται για την σελιδοποίηση αναζητήσεων LDAP που μπορεί να επιστρέψουν πολλά δεδομένα, όπως απαρίθμηση χρηστών ή ομάδων. (Η τιμή 0 απενεργοποιεί την σελιδοποίηση των αναζητήσεων LDAP σε αυτές τις περιπτώσεις.)"
 
 #: templates/settings.php:42
 msgid "Special Attributes"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 3138530f0d..3a60c50a64 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -59,207 +59,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,12 +291,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -324,107 +324,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passcode"
-
-#: 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -668,6 +677,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passcode"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index a7dceb189d..638063629f 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/en@pirate/files_external.po b/l10n/en@pirate/files_external.po
index b4caece8b5..99e7c3708d 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: en@pirate\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Secret Code"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index 5209e66833..383a876d9b 100644
--- a/l10n/en@pirate/files_sharing.po
+++ b/l10n/en@pirate/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +18,7 @@ msgstr ""
 "Language: en@pirate\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -58,16 +58,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Download"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/en@pirate/files_trashbin.po b/l10n/en@pirate/files_trashbin.po
index 09c83d1aa9..8b36a8c34e 100644
--- a/l10n/en@pirate/files_trashbin.po
+++ b/l10n/en@pirate/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po
index 9029e8c7d1..533a509283 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: en@pirate\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index 6f2f0d0bb7..7b3086bbba 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index 68f450bd8d..e365edad4b 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-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr[1] ""
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:984
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index 046deb4135..d82f97f438 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -59,207 +59,207 @@ msgstr "No temporary profile picture available, try again"
 msgid "No crop data provided"
 msgstr "No crop data provided"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Sunday"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Monday"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Thursday"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Friday"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Saturday"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "January"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "February"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "March"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "April"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "May"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "June"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "July"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "August"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "October"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "December"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Settings"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Saving..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "seconds ago"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minute ago"
 msgstr[1] "%n minutes ago"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n hour ago"
 msgstr[1] "%n hours ago"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "today"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "yesterday"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n day ago"
 msgstr[1] "%n days ago"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "last month"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n month ago"
 msgstr[1] "%n months ago"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "last year"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "years ago"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Choose"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Error loading file picker template: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Yes"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Choose"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Error loading file picker template: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "OK"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Error loading message template: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} file conflict"
 msgstr[1] "{count} file conflicts"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "One file conflict"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "New Files"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Already existing files"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Which files do you wish to keep?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Cancel"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Continue"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(all selected)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} selected)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Error loading file exists template"
 
@@ -291,12 +291,12 @@ msgstr "Shared"
 msgid "Share"
 msgstr "Share"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Error whilst sharing"
 
@@ -324,107 +324,116 @@ msgstr "Share with user or group …"
 msgid "Share link"
 msgstr "Share link"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "The public link will expire no later than {days} days after it is created"
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr "By default the public link will expire after {days} days"
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Password protect"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Password"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Allow Public Upload"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Email link to person"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Set expiration date"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Expiration date"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Share via email:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "No people found"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "group"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Resharing is not allowed"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Shared in {item} with {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Unshare"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "notify by email"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "can edit"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "access control"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "create"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "update"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "delete"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "share"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Password protected"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Error unsetting expiration date"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Sending ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Email sent"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Warning"
 
@@ -668,6 +677,10 @@ msgstr "For information how to properly configure your server, please see the <a
 msgid "Create an <strong>admin account</strong>"
 msgstr "Create an <strong>admin account</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Password"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Storage & database"
diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po
index 77776b1b6a..1232f5a059 100644
--- a/l10n/en_GB/files.po
+++ b/l10n/en_GB/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -28,7 +28,7 @@ msgstr "Could not move %s - File with this name already exists"
 msgid "Could not move %s"
 msgstr "Could not move %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "File name cannot be empty."
 
@@ -37,18 +37,18 @@ msgstr "File name cannot be empty."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" is an invalid file name."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "The target folder has been moved or deleted."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -140,28 +140,32 @@ msgstr "Upload failed. Could not get file info."
 msgid "Invalid directory."
 msgstr "Invalid directory."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Files"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Unable to upload {filename} as it is a directory or has 0 bytes"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Total file size {size1} exceeds upload limit {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 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:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Upload cancelled."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Could not get result from server."
 
@@ -174,131 +178,135 @@ msgstr "File upload is in progress. Leaving the page now will cancel the upload.
 msgid "URL cannot be empty"
 msgstr "URL cannot be empty"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} already exists"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Could not create file"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Could not create folder"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Error fetching URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Share"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Delete permanently"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Rename"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Error moving file"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Error"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Pending"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Error moving file."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Error moving file"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Error"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Could not rename file"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Error deleting file."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Name"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Size"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Modified"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n folder"
 msgstr[1] "%n folders"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n file"
 msgstr[1] "%n files"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} and {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Uploading %n file"
 msgstr[1] "Uploading %n files"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" is an invalid file name."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Your storage is full, files can not be updated or synced anymore!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Your storage is almost full ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Encryption App is enabled but your keys are not initialised, please log-out and log-in again"
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} and {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Name"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Size"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Modified"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s could not be renamed"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Upload (max. %s)"
@@ -335,68 +343,75 @@ msgstr "Maximum input size for ZIP files"
 msgid "Save"
 msgstr "Save"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "New"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "New text file"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Text file"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "New folder"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "From link"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Deleted files"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Cancel upload"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Nothing in here. Upload something!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Delete"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Upload too large"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Files are being scanned, please wait."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Currently scanning"
diff --git a/l10n/en_GB/files_external.po b/l10n/en_GB/files_external.po
index 03485fd10e..985090d95e 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-04-10 01:54-0400\n"
-"PO-Revision-Date: 2014-04-09 14:20+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 12:02+0000\n"
 "Last-Translator: mnestis <transifex@mnestis.net>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,166 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Local"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Location"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Key"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Secret"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr "Bucket"
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr "Amazon S3 and compliant"
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "Access Key"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Secret Key"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "Hostname (optional)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Port (optional)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Region (optional)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Enable SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr "Enable Path Style"
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "App key"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr "App secret"
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Username"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Password"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Root"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "Secure ftps://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "Client ID"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr "Client secret"
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr "OpenStack Object Storage"
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Username (required)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr "Bucket (required)"
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr "Region (optional for OpenStack Object Storage)"
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr "API Key (required for Rackspace Cloud Files)"
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr "Tenantname (required for OpenStack Object Storage)"
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr "Password (required for OpenStack Object Storage)"
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr "Service Name (required for OpenStack Object Storage)"
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr "URL of identity endpoint (required for OpenStack Object Storage)"
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr "Timeout of HTTP requests in seconds (optional)"
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Share"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr "SMB / CIFS using OC login"
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr "Username as share"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "Secure https://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "Remote subfolder"
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Access granted"
@@ -42,29 +202,29 @@ msgstr "Error configuring Google Drive storage"
 msgid "Saved"
 msgstr "Saved"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Note:</b> "
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr " and "
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 "<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:626
+#: lib/config.php:623
 #, 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 "<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:628
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po
index 1874dfa459..d79515f702 100644
--- a/l10n/en_GB/files_sharing.po
+++ b/l10n/en_GB/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-18 01:55-0400\n"
-"PO-Revision-Date: 2014-03-17 13:08+0000\n"
+"POT-Creation-Date: 2014-05-13 01:55-0400\n"
+"PO-Revision-Date: 2014-05-12 11:15+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,7 +18,7 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Shared by {owner}"
 
@@ -58,16 +58,15 @@ msgstr "sharing is disabled"
 msgid "For more info, please ask the person who sent this link."
 msgstr "For more info, please ask the person who sent this link."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "shared by %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Download"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Download %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Direct link"
diff --git a/l10n/en_GB/files_trashbin.po b/l10n/en_GB/files_trashbin.po
index ed08368d37..ea8eac1083 100644
--- a/l10n/en_GB/files_trashbin.po
+++ b/l10n/en_GB/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Couldn't delete %s permanently"
 msgid "Couldn't restore %s"
 msgstr "Couldn't restore %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Deleted files"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Error"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Deleted Files"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "restored"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Nothing in here. Your recycle bin is empty!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Name"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Restore"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Error"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "restored"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Nothing in here. Your recycle bin is empty!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Name"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Deleted"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Delete"
diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po
index 5772e85227..436d1d0b06 100644
--- a/l10n/en_GB/lib.po
+++ b/l10n/en_GB/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 14:01+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,13 +18,16 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr "You are accessing the server from an untrusted domain."
 
-#: base.php:724
-msgid "Please contact your administrator"
-msgstr "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php."
 
 #: private/app.php:236
 #, php-format
@@ -74,23 +77,23 @@ msgstr "Invalid image"
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP download is turned off."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Files need to be downloaded one by one."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Back to Files"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Selected files too large to generate zip file."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -276,19 +279,19 @@ msgstr "Set an admin username."
 msgid "Set an admin password."
 msgstr "Set an admin password."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s shared \"%s\" with you"
@@ -330,73 +333,79 @@ msgstr "Sharing %s failed, because the group %s does not exist"
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Sharing %s failed, because %s is not a member of the group %s"
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Sharing %s failed, because sharing with links is not allowed"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Share type %s is not valid for %s"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Setting permissions for %s failed, because the permissions exceed permissions granted to %s"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Setting permissions for %s failed, because the item was not found"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Sharing backend %s must implement the interface OCP\\Share_Backend"
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Sharing backend %s not found"
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Sharing backend for %s not found"
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Sharing %s failed, because the user %s is the original sharer"
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Sharing %s failed, because the permissions exceed permissions granted to %s"
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Sharing %s failed, because resharing is not allowed"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Sharing %s failed, because the sharing backend for %s could not find its source"
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr "Sharing %s failed, because the file could not be found in the file cache"
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Could not find category \"%s\""
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index 6b026ba483..15be309c52 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Send mode"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Encryption"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Authentication method"
 
@@ -99,6 +99,16 @@ msgstr "Couldn't decrypt your files, please check your owncloud.log or ask your
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Couldn't decrypt your files, check your password and try again"
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Encryption keys deleted permanently"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator"
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Email saved"
@@ -115,6 +125,16 @@ msgstr "Unable to delete group"
 msgid "Unable to delete user"
 msgstr "Unable to delete user"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Backups restored successfully"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator"
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Language changed"
@@ -170,7 +190,7 @@ msgstr "Back-end doesn't support password change, but the user's encryption key
 msgid "Unable to change password"
 msgstr "Unable to change password"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Sending..."
 
@@ -226,34 +246,42 @@ msgstr "Update"
 msgid "Updated"
 msgstr "Updated"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Select a profile picture"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Very weak password"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Weak password"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "So-so password"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Good password"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Strong password"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Decrypting files... Please wait, this can take some time."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Delete encryption keys permanently."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Restore encryption keys."
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "deleted"
@@ -299,7 +327,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "English (British English)"
 
@@ -487,148 +515,143 @@ msgstr "Allow apps to use the Share API"
 msgid "Allow links"
 msgstr "Allow links"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Allow public uploads"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Allow resharing"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Allow users to share with anyone"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Allow mail notification"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Allow users to send mail notification for shared files"
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
-msgstr ""
+msgstr "Set default expiry date"
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr "Expire after "
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr "days"
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
-msgstr ""
+msgstr "Enforce expiry date"
+
+#: templates/admin.php:242
+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:252
+msgid "Allow resharing"
+msgstr "Allow resharing"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Allow users to share items shared with them again"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Allow users to share with anyone"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
-msgstr "Expire shares by default after N days"
+msgid "Allow mail notification"
+msgstr "Allow mail notification"
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr "Allow users to send mail notification for shared files"
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Security"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Enforce HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "Email Server"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "This is used for sending out notifications."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "From address"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Authentication required"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Server address"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Credentials"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "SMTP Username"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "SMTP Password"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Test email settings"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Send email"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Log level"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "More"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Less"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +804,33 @@ msgstr "Language"
 msgid "Help translate"
 msgstr "Help translate"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Log-in password"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Decrypt all Files"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Restore Encryption Keys"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Delete Encryption Keys"
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Login Name"
diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po
index f3cc6ffede..e9e420c1f3 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 09:40+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -87,65 +87,65 @@ msgstr "Success"
 msgid "Error"
 msgstr "Error"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuration OK"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Configuration incorrect"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Configuration incomplete"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Select groups"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Select object classes"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Select attributes"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Connection test succeeded"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Connection test failed"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Do you really want to delete the current Server Configuration?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Confirm Deletion"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s group found"
 msgstr[1] "%s groups found"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s user found"
 msgstr[1] "%s users found"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Invalid Host"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Could not find the desired feature"
 
diff --git a/l10n/en_NZ/core.po b/l10n/en_NZ/core.po
new file mode 100644
index 0000000000..d121cc7107
--- /dev/null
+++ b/l10n/en_NZ/core.po
@@ -0,0 +1,818 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_NZ\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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:483
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:583
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1240
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1241
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1242
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1243
+msgid "today"
+msgstr ""
+
+#: js/js.js:1244
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1245
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1246
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1247
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1248
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1249
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+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:761
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:160 js/share.js:824
+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:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:289
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:292
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:336 js/share.js:397
+msgid "group"
+msgstr ""
+
+#: js/share.js:369
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:413
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:435
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:443
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:446
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:448
+msgid "access control"
+msgstr ""
+
+#: js/share.js:451
+msgid "create"
+msgstr ""
+
+#: js/share.js:454
+msgid "update"
+msgstr ""
+
+#: js/share.js:457
+msgid "delete"
+msgstr ""
+
+#: js/share.js:460
+msgid "share"
+msgstr ""
+
+#: js/share.js:742
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:761
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:782
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:811
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:822
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:846
+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:264
+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:60 templates/login.php:40
+msgid "Password"
+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/en_NZ/files.po b/l10n/en_NZ/files.po
new file mode 100644
index 0000000000..eca8744f56
--- /dev/null
+++ b/l10n/en_NZ/files.po
@@ -0,0 +1,416 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_NZ\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:103
+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:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, 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:169
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:179
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:194
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1672
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1335
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1580 js/filelist.js:1619
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+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:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+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/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/en_NZ/files_encryption.po b/l10n/en_NZ/files_encryption.po
new file mode 100644
index 0000000000..39470573e4
--- /dev/null
+++ b/l10n/en_NZ/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-05-01 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_NZ\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/en_NZ/files_external.po b/l10n/en_NZ/files_external.po
new file mode 100644
index 0000000000..dca47c9c29
--- /dev/null
+++ b/l10n/en_NZ/files_external.po
@@ -0,0 +1,296 @@
+# 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-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_NZ\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: 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:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, 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:623
+#, 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:625
+#, 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/en_NZ/files_sharing.po b/l10n/en_NZ/files_sharing.po
new file mode 100644
index 0000000000..0e4ed14357
--- /dev/null
+++ b/l10n/en_NZ/files_sharing.po
@@ -0,0 +1,71 @@
+# 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-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_NZ\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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:53
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:57
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/en_NZ/files_trashbin.po b/l10n/en_NZ/files_trashbin.po
new file mode 100644
index 0000000000..b0d50546f7
--- /dev/null
+++ b/l10n/en_NZ/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_NZ\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 ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/en_NZ/files_versions.po b/l10n/en_NZ/files_versions.po
new file mode 100644
index 0000000000..84623b083b
--- /dev/null
+++ b/l10n/en_NZ/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-05-01 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_NZ\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/en_NZ/lib.po b/l10n/en_NZ/lib.po
new file mode 100644
index 0000000000..22171fe7e6
--- /dev/null
+++ b/l10n/en_NZ/lib.po
@@ -0,0 +1,476 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_NZ\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:685
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: 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:880
+#, 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:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+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:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+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:164
+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:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:498
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:523
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:529
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:538
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:551 private/share/share.php:579
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:559
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:566
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:645
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:783
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:844
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:955
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:962
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:968
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1383
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1392
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1407
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1419
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1433
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/en_NZ/settings.po b/l10n/en_NZ/settings.po
new file mode 100644
index 0000000000..07188058ea
--- /dev/null
+++ b/l10n/en_NZ/settings.po
@@ -0,0 +1,885 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_NZ\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:317
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:354
+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/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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: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:81
+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:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:50 personal.php:51
+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:223
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:230
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:235
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:292
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:294
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:300
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:312
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:314
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:345
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:367
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:380
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:381
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:384
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:388
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:389
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:394
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:395
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:427
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:428
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:434 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:438 templates/personal.php:199
+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:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+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/en_NZ/user_ldap.po b/l10n/en_NZ/user_ldap.po
new file mode 100644
index 0000000000..346e6243ae
--- /dev/null
+++ b/l10n/en_NZ/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-05-01 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_NZ\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:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+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:984
+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 insensitive 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/en_NZ/user_webdavauth.po b/l10n/en_NZ/user_webdavauth.po
new file mode 100644
index 0000000000..fefdb89608
--- /dev/null
+++ b/l10n/en_NZ/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-05-01 01:55-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_NZ\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/eo/core.po b/l10n/eo/core.po
index 50da857e62..9f97cad3a1 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -60,207 +60,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "dimanĉo"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "lundo"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "mardo"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "merkredo"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "ĵaŭdo"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "vendredo"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "sabato"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Januaro"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februaro"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Marto"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Aprilo"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Majo"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Junio"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Julio"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Aŭgusto"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Septembro"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktobro"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Novembro"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Decembro"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Konservante..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "sekundoj antaŭe"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "antaŭ %n minuto"
 msgstr[1] "antaŭ %n minutoj"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "antaŭ %n horo"
 msgstr[1] "antaŭ %n horoj"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "hodiaŭ"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "hieraŭ"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "antaŭ %n tago"
 msgstr[1] "antaŭ %n tagoj"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "lastamonate"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "antaŭ %n monato"
 msgstr[1] "antaŭ %n monatoj"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "lastajare"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "jaroj antaŭe"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Elekti"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Jes"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Elekti"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Akcepti"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} dosierkonflikto"
 msgstr[1] "{count} dosierkonfliktoj"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Unu dosierkonflikto"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Novaj dosieroj"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Kiujn dosierojn vi volas konservi?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Nuligi"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(ĉiuj elektitas)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} elektitas)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -292,12 +292,12 @@ msgstr "Dividita"
 msgid "Share"
 msgstr "Kunhavigi"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Eraro"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Eraro dum kunhavigo"
 
@@ -325,107 +325,116 @@ msgstr "Kunhavigi kun uzanto aŭ grupo..."
 msgid "Share link"
 msgstr "Konhavigi ligilon"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Protekti per pasvorto"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Pasvorto"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Retpoŝti la ligilon al ulo"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Sendi"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Agordi limdaton"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Limdato"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Kunhavigi per retpoŝto:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Ne troviĝis gento"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Rekunhavigo ne permesatas"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Kunhavigita en {item} kun {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Malkunhavigi"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "avizi per retpoŝto"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "povas redakti"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "alirkontrolo"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "krei"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "ĝisdatigi"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "forigi"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "kunhavigi"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Protektita per pasvorto"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Eraro dum malagordado de limdato"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Eraro dum agordado de limdato"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Sendante..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "La retpoŝtaĵo sendiĝis"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Averto"
 
@@ -669,6 +678,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Krei <strong>administran konton</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Pasvorto"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index d3af9c674f..b9382e8488 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -28,7 +28,7 @@ msgstr "Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas"
 msgid "Could not move %s"
 msgstr "Ne eblis movi %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Dosiernomo devas ne malpleni."
 
@@ -37,18 +37,18 @@ msgstr "Dosiernomo devas ne malpleni."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -140,28 +140,32 @@ msgstr "La alŝuto malsukcesis. Ne povis ekhaviĝi informo pri dosiero."
 msgid "Invalid directory."
 msgstr "Nevalida dosierujo."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Dosieroj"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Ne povis alŝutiĝi {filename} ĉar ĝi estas dosierujo aŭ ĝi havas 0 duumokojn"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "La alŝuto nuliĝis."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Ne povis ekhaviĝi rezulto el la servilo."
 
@@ -174,131 +178,135 @@ msgstr "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton."
 msgid "URL cannot be empty"
 msgstr "La URL ne povas malpleni"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} jam ekzistas"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Ne povis kreiĝi dosiero"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Ne povis kreiĝi dosierujo"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Kunhavigi"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Forigi por ĉiam"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Alinomigi"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Eraris movo de dosiero"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Eraro"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Traktotaj"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Eraris movo de dosiero"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Eraro"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Ne povis alinomiĝi dosiero"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nomo"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Grando"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Modifita"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dosierujo"
 msgstr[1] "%n dosierujoj"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n dosiero"
 msgstr[1] "%n dosieroj"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} kaj {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Alŝutatas %n dosiero"
 msgstr[1] "Alŝutatas %n dosieroj"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Via memoro preskaŭ plenas ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} kaj {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nomo"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Grando"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Modifita"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s ne povis alinomiĝi"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -335,68 +343,75 @@ msgstr "Maksimuma enirgrando por ZIP-dosieroj"
 msgid "Save"
 msgstr "Konservi"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Nova"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Tekstodosiero"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nova dosierujo"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Dosierujo"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "El ligilo"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Forigitaj dosieroj"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Nuligi alŝuton"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Nenio estas ĉi tie. Alŝutu ion!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Forigi"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Alŝuto tro larĝa"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Dosieroj estas skanataj, bonvolu atendi."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Nuna skano"
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index b92b2672f9..949ed96604 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -17,6 +17,166 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Loko"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Gastigo"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Uzantonomo"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Pasvorto"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Kunhavigi"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Alirpermeso donita"
@@ -41,29 +201,29 @@ msgstr "Eraro dum agordado de la memorservo Google Drive"
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index e9123ea9db..9a16255777 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +18,7 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Kunhavigita de {owner}"
 
@@ -58,16 +58,15 @@ msgstr "kunhavigo malkapablas"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Por plia informo, bonvolu peti al la persono, kiu sendis ĉi tiun ligilon."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr ""
+#: templates/public.php:21
+msgid "Download"
+msgstr "Elŝuti"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Direkta ligilo"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index 93392a0cd3..1717979aa2 100644
--- a/l10n/eo/files_trashbin.po
+++ b/l10n/eo/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Ne povis foriĝi %s por ĉiam"
 msgid "Couldn't restore %s"
 msgstr "Ne povis restaŭriĝi %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Forigitaj dosieroj"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Eraro"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Forigitaj dosieroj"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "restaŭrita"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Nenio estas ĉi tie. Via rubujo malplenas!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nomo"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Restaŭri"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Eraro"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "restaŭrita"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Nenio estas ĉi tie. Via rubujo malplenas!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nomo"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Forigita"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Forigi"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index d30a8b2f4a..e4fe11f4f5 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +18,15 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -74,23 +77,23 @@ msgstr "Ne validas bildo"
 msgid "web services under your control"
 msgstr "TTT-servoj regataj de vi"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP-elŝuto estas malkapabligita."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Dosieroj devas elŝutiĝi unuope."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Reen al la dosieroj"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -276,19 +279,19 @@ msgstr "Starigi administran uzantonomon."
 msgid "Set an admin password."
 msgstr "Starigi administran pasvorton."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s kunhavigis “%s” kun vi"
@@ -330,73 +333,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Ne troviĝis kategorio “%s”"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index e4c92cf839..1604f98aee 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Ĉifrado"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "La retpoŝtadreso konserviĝis"
@@ -114,6 +124,16 @@ msgstr "Ne eblis forigi la grupon"
 msgid "Unable to delete user"
 msgstr "Ne eblis forigi la uzanton"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "La lingvo estas ŝanĝita"
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr "Ĝisdatigi"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "forigita"
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Esperanto"
 
@@ -486,148 +514,143 @@ msgstr "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo"
 msgid "Allow links"
 msgstr "Kapabligi ligilojn"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 "Kapabligi rekunhavigon"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Kapabligi uzantojn kunhavigi kun ĉiu ajn"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Kapabligi rekunhavigon"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Kapabligi uzantojn kunhavigi kun ĉiu ajn"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj"
+
 #: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Servila adreso"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Pordo"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Aŭtentigiloj"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Protokolo"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Registronivelo"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Pli"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Malpli"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Eldono"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr "Lingvo"
 msgid "Help translate"
 msgstr "Helpu traduki"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Ensaluti"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index a7ad8cb316..6843221da0 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -87,65 +87,65 @@ msgstr "Sukceso"
 msgid "Error"
 msgstr "Eraro"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Elekti grupojn"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Elekti objektoklasojn"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Elekti atribuojn"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Provo de konekto sukcesis"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Provo de konekto malsukcesis"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Konfirmi forigon"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s grupo troviĝis"
 msgstr[1] "%s grupoj troviĝis"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s uzanto troviĝis"
 msgstr[1] "%s uzanto troviĝis"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Nevalida gastigo"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 621c192338..d3d8487817 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -6,10 +6,11 @@
 # Art O. Pal <artopal@fastmail.fm>, 2013-2014
 # ggam <ggam@brainleakage.com>, 2013
 # I Robot, 2013
-# juanman <juanma@kde.org.ar>, 2013
+# juanman <juanma@kde.org.ar>, 2013-2014
 # msoko <sokolovitch@yahoo.com>, 2013
+# mario.arranz <mario.arranz@gmail.com>, 2014
 # pablomillaquen <pablomillaquen@gmail.com>, 2013
-# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013-2014
 # Rubén del Campo <yo@rubendelcampo.es>, 2013
 # saskarip <saskarip@gmail.com>, 2013
 # saskarip <saskarip@gmail.com>, 2013
@@ -21,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"Last-Translator: Raul Fernandez Garcia <raulfg3@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"
@@ -72,207 +73,207 @@ msgstr "No hay disponible una imagen temporal de perfil, pruebe de nuevo"
 msgid "No crop data provided"
 msgstr "No se proporcionó datos del recorte"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Lunes"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Martes"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Jueves"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Viernes"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sábado"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Enero"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Febrero"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Marzo"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Abril"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mayo"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Junio"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Julio"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Agosto"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Septiembre"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Octubre"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Noviembre"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Diciembre"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
-msgstr "segundos antes"
+msgstr "hace segundos"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Hace %n minuto"
-msgstr[1] "Hace %n minutos"
+msgstr[1] "hace %n minutos"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Hace %n hora"
-msgstr[1] "Hace %n horas"
+msgstr[1] "hace %n horas"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Hace %n día"
-msgstr[1] "Hace %n días"
+msgstr[1] "hace %n días"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Hace %n mes"
-msgstr[1] "Hace %n meses"
+msgstr[1] "hace %n meses"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
-msgstr "años antes"
+msgstr "hace años"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Seleccionar"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Error cargando plantilla del seleccionador de archivos: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Seleccionar"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Error cargando plantilla del seleccionador de archivos: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Aceptar"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Error cargando plantilla del mensaje: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} conflicto de archivo"
 msgstr[1] "{count} conflictos de archivo"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "On conflicto de archivo"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Nuevos Archivos"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Archivos ya existentes"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "¿Que archivos deseas mantener?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Continuar"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(seleccionados todos)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} seleccionados)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Error cargando plantilla de archivo existente"
 
@@ -304,12 +305,12 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
@@ -337,107 +338,116 @@ msgstr "Compartido con el usuario o con el grupo ..."
 msgid "Share link"
 msgstr "Enlace compartido"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "El link publico no expirará antes de {days} desde que fué creado"
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr "El link publico expirará por defecto pasados {days} dias"
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Protección con contraseña"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Contraseña"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr "Elija una contraseña para el enlace publico"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Permitir Subida Pública"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Enviar enlace por correo electrónico a una persona"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Establecer fecha de caducidad"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Fecha de caducidad"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Compartir por correo electrónico:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "No se encontró gente"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "No se permite compartir de nuevo"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "notificar por correo electrónico"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "puede editar"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Protegido con contraseña"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Error eliminando fecha de caducidad"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Error estableciendo fecha de caducidad"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Correo electrónico enviado"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Precaución"
 
@@ -681,6 +691,10 @@ msgstr "Para información de cómo configurar apropiadamente su servidor, por fa
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear una <strong>cuenta de administrador</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Contraseña"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Almacenamiento y base de datos"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index a0c0dd87b4..67fe6210b1 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -9,7 +9,7 @@
 # juanman <juanma@kde.org.ar>, 2013
 # mikelanabitarte <inactive+mikelanabitarte@transifex.com>, 2013
 # plaguna <laguna.sanchez@gmail.com>, 2014
-# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013-2014
 # qdneren <renanqd@yahoo.com.mx>, 2013
 # Rubén del Campo <yo@rubendelcampo.es>, 2013
 # saskarip <saskarip@gmail.com>, 2013
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"Last-Translator: Raul Fernandez Garcia <raulfg3@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"
@@ -38,7 +38,7 @@ msgstr "No se pudo mover %s - Ya existe un archivo con ese nombre."
 msgid "Could not move %s"
 msgstr "No se pudo mover %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "El nombre de archivo no puede estar vacío."
 
@@ -47,18 +47,18 @@ msgstr "El nombre de archivo no puede estar vacío."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" es un nombre de archivo inválido."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos "
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "La carpeta destino fue movida o eliminada."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -150,28 +150,32 @@ msgstr "Actualización fallida. No se pudo obtener información del archivo."
 msgid "Invalid directory."
 msgstr "Directorio inválido."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Archivos"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Todos los archivos"
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "El tamaño total del archivo {size1} excede el límite {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 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:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "No se pudo obtener respuesta del servidor."
 
@@ -184,131 +188,135 @@ msgstr "La subida del archivo está en proceso. Si sale de la página ahora, la
 msgid "URL cannot be empty"
 msgstr "La dirección URL no puede estar vacía"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "No se pudo crear el archivo"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "No se pudo crear la carpeta"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Error al descargar URL."
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Renombrar"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Error moviendo archivo"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Error"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Error al mover el archivo."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Error moviendo archivo"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Error"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "No se pudo renombrar el archivo"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Error al borrar el archivo"
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nombre"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Tamaño"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Modificado"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n carpeta"
 msgstr[1] "%n carpetas"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n archivo"
 msgstr[1] "%n archivos"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} y {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Subiendo %n archivo"
 msgstr[1] "Subiendo %n archivos"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" es un nombre de archivo inválido."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "La app de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo."
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} y {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nombre"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Tamaño"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Modificado"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s no pudo ser renombrado"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Subida (máx. %s)"
@@ -345,68 +353,75 @@ msgstr "Tamaño máximo para archivos ZIP de entrada"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Use esta URL <a href=\"%s\" target=\"_blank\">para acceder via WebDAV</a>"
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Nuevo"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Nuevo archivo de texto"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Archivo de texto"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Carpeta"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Desde enlace"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Archivos eliminados"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada aquí. ¡Suba algo!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Subida demasido grande"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Los archivos están siendo escaneados,  por favor espere."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Escaneo actual"
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index af6aa0b29e..bd37a3740c 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Art O. Pal <artopal@fastmail.fm>, 2014
+# mreyesca <mreyesca@luthcueit.onmicrosoft.com>, 2014
 # Rubén del Campo <yo@rubendelcampo.es>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 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"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -19,6 +20,166 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Local"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Ubicación"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Clave"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Secreto"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr "Depósito"
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr "Amazon S3 y compatibilidad"
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "Clave de Acceso"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Clave Secreta"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "Nombre de Equipo (opcional)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Puerto (opcional)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Región (opcional)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Habilitar SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr "Habilitar Estilo de Ruta"
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "App principal"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr "App secreta"
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Servidor"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Contraseña"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Raíz"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "Secure ftps://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "ID de Cliente"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr "Cliente secreto"
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr "OpenStack Object Storage"
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Nombre de Usuario (requerido)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr "Depósito (requerido)"
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr "Región (opcional para OpenStack Object Storage)"
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr "Clave API (requerida para Rackspace Cloud Files)"
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr "Nombre de Inquilino (requerido para OpenStack Object Storage)"
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr "Contraseña (requerida para OpenStack Object Storage)"
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr "Nombre de Servicio (requerido para OpenStack Object Storage)"
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr "URL de identidad de punto final (requerido para OpenStack Object Storage)"
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr "Tiempo de espera de peticiones HTTP en segundos (opcional)"
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Compartir"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr "SMB / CIFS usando acceso OC"
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr "Nombre de Usuario como compartir"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "Secure https://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "Subcarpeta remota"
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Acceso concedido"
@@ -43,29 +204,29 @@ msgstr "Error configurando el almacenamiento de Google Drive"
 msgid "Saved"
 msgstr "Guardado"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Nota:</b> "
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr "y"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 "<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:626
+#: lib/config.php:623
 #, 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 "<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:628
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index f44f8bcb5b..2cb549e820 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-29 01:55-0400\n"
-"PO-Revision-Date: 2014-03-28 06:16+0000\n"
-"Last-Translator: victormce <victormce@gmail.com>\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -21,7 +21,7 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Compartido por {owner}"
 
@@ -61,16 +61,15 @@ msgstr "compartir está desactivado"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para mayor información, contacte a la persona que le envió el enlace."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "Compartido por %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Descargar"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Descargar %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Enlace directo"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index 47dd8c8dbe..8159e08530 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: victormce <victormce@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -29,38 +29,34 @@ msgstr "No se puede eliminar %s permanentemente"
 msgid "Couldn't restore %s"
 msgstr "No se puede restaurar %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Archivos eliminados"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Error"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Archivos Eliminados"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "recuperado"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "No hay nada aquí. ¡Tu papelera esta vacía!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nombre"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Recuperar"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Error"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "recuperado"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "No hay nada aquí. ¡Tu papelera esta vacía!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nombre"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Eliminar"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index aad3e7a59b..b8875de471 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -6,8 +6,9 @@
 # Art O. Pal <artopal@fastmail.fm>, 2014
 # Dharth <emilpg@gmail.com>, 2013
 # inye <j.contrerasferrada@gmail.com>, 2014
+# mreyesca <mreyesca@luthcueit.onmicrosoft.com>, 2014
 # pablomillaquen <pablomillaquen@gmail.com>, 2013
-# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013-2014
 # Rubén del Campo <yo@rubendelcampo.es>, 2013
 # victormce <victormce@gmail.com>, 2014
 # xhiena <xhiena@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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 18:00+0000\n"
-"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"Last-Translator: Raul Fernandez Garcia <raulfg3@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"
@@ -25,13 +26,16 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Está accediendo al servidor desde un dominio inseguro."
 
-#: base.php:724
-msgid "Please contact your administrator"
-msgstr "Contacte a su administrador"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr "Contacte a su administrador. Si usted es el administrador, configure \"trusted_domain\" en config/config.php. En config/config.sample.php se encuentra un ejemplo para la configuración."
 
 #: private/app.php:236
 #, php-format
@@ -81,23 +85,23 @@ msgstr "Imagen inválida"
 msgid "web services under your control"
 msgstr "Servicios web bajo su control"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP está desactivada."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados uno por uno."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Volver a Archivos"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -283,19 +287,19 @@ msgstr "Configurar un nombre de usuario del administrador"
 msgid "Set an admin password."
 msgstr "Configurar la contraseña del administrador."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s ha compatido  »%s« contigo"
@@ -337,73 +341,79 @@ msgstr "Compartiendo %s ha fallado, ya que el grupo %s no existe"
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Compartiendo %s ha fallado, ya que %s no es miembro del grupo %s"
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Es necesario definir una contraseña para crear un enlace publico. Solo los enlaces protegidos están permitidos"
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Compartiendo %s ha fallado, ya que compartir con enlaces no está permitido"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Compartir tipo %s no es válido para %s"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Configuración de permisos para %s ha fallado, ya que los permisos superan los permisos dados a %s"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Configuración de permisos para %s ha fallado, ya que el elemento no fue encontrado"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
-msgstr ""
+msgstr "El motor compartido %s debe implementar la interfaz OCP\\Share_Backend"
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
-msgstr ""
+msgstr "El motor compartido %s no se ha encontrado"
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
-msgstr ""
+msgstr "Motor compartido para %s no encontrado"
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Compartiendo %s ha fallado, ya que el usuario %s es el compartidor original"
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Compartiendo %s ha fallado, ya que los permisos superan los permisos otorgados a %s"
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Compartiendo %s ha fallado, ya que volver a compartir no está permitido"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
-msgstr ""
+msgstr "Compartir %s falló porque el motor compartido para %s podría no encontrar su origen"
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr "Compartiendo %s ha fallado, ya que el archivo no pudo ser encontrado en el cache de archivo"
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "No puede encontrar la categoria \"%s\""
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 62346be476..949c2d5a1d 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -10,9 +10,10 @@
 # japaol <japaol@gmail.com>, 2013
 # Jose Luis Tirado <joseluis.tirado@gmail.com>, 2014
 # juanman <juanma@kde.org.ar>, 2013-2014
+# mario.arranz <mario.arranz@gmail.com>, 2014
 # plaguna <laguna.sanchez@gmail.com>, 2014
 # pablomillaquen <pablomillaquen@gmail.com>, 2013
-# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013-2014
 # qdneren <renanqd@yahoo.com.mx>, 2013
 # Rubén del Campo <yo@rubendelcampo.es>, 2013
 # saskarip <saskarip@gmail.com>, 2013
@@ -22,9 +23,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"Last-Translator: Raul Fernandez Garcia <raulfg3@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"
@@ -62,15 +63,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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Modo de envío"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
@@ -113,6 +114,16 @@ msgstr "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo"
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Claves de cifrado eliminadas permanentemente"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "No se pudieron eliminar permanentemente sus claves de cifrado. Revise owncloud.log o consulte con su administrador."
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Correo electrónico guardado"
@@ -129,6 +140,16 @@ msgstr "No se pudo eliminar el grupo"
 msgid "Unable to delete user"
 msgstr "No se pudo eliminar el usuario"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Copia de seguridad restaurada"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "No se pudieron restarurar sus claves de cifrado. Revise owncloud.log o consulte con su administrador."
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Idioma cambiado"
@@ -184,7 +205,7 @@ msgstr "El back-end no soporta cambios de contraseña, pero la clave de cifrado
 msgid "Unable to change password"
 msgstr "No se ha podido cambiar la contraseña"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Enviando..."
 
@@ -240,34 +261,42 @@ msgstr "Actualizar"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Seleccionar una imagen de perfil"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Contraseña muy débil"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Contraseña débil"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Contraseña pasable"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Contraseña buena"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Contraseña muy buena"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Eliminar claves de cifrado permanentemente."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Restaurar claves de cifrado."
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "eliminado"
@@ -313,7 +342,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Castellano"
 
@@ -501,148 +530,143 @@ msgstr "Permitir a las aplicaciones utilizar la API de Compartición"
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr "Mejora la protección por contraseña."
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Permitir subidas públicas"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Permitir re-compartición"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Permitir a los usuarios compartir con cualquier persona"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Permitir notificaciones por correo electrónico"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos"
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
-msgstr ""
+msgstr "Establecer fecha de caducidad predeterminada"
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr "Caduca luego de"
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr "días"
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
-msgstr ""
+msgstr "Imponer fecha de caducidad"
+
+#: templates/admin.php:242
+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:252
+msgid "Allow resharing"
+msgstr "Permitir re-compartición"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Permitir a los usuarios compartir de nuevo elementos ya compartidos"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Permitir a los usuarios compartir con cualquier persona"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
-msgstr "Archivos compartidos caducan luego de N días"
+msgid "Allow mail notification"
+msgstr "Permitir notificaciones por correo electrónico"
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos"
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "Servidor de correo electrónico"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Esto se usa para enviar notificaciones."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Desde la dirección"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Se necesita autenticación"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Dirección del servidor"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Credenciales"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "Nombre de usuario SMTP"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "Contraseña SMTP"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Probar configuración de correo electrónico"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Enviar mensaje"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Nivel de registro"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -795,29 +819,33 @@ msgstr "Idioma"
 msgid "Help translate"
 msgstr "Ayúdanos a traducir"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Contraseña de acceso"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Descifrar archivos"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Sus claves de cifrado se archivarán en una localización segura. Así en caso de que algo fuese mal podrá recuperan sus claves. Borre sus claves de cifrado permanentemente solamente si esta seguro de que sus archivos han sido descifrados correctamente."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Restaurar claves de cifrado"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Eliminar claves de cifrado"
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Nombre de usuario"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index a665ba3c3a..c662d5b998 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 15:00+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
 "Last-Translator: plaguna <laguna.sanchez@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -137,25 +137,25 @@ msgstr "¿Realmente desea eliminar la configuración actual del servidor?"
 msgid "Confirm Deletion"
 msgstr "Confirmar eliminación"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "Grupo %s encontrado"
 msgstr[1] "Grupos %s encontrados"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "Usuario %s encontrado"
 msgstr[1] "Usuarios %s encontrados"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Host inválido"
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "No se puede encontrar la función deseada."
 
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 4ada9f6091..ce1e8118b7 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 20:10+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -60,79 +60,79 @@ msgstr "No hay una imágen temporal del perfil disponible, intente de nuevo"
 msgid "No crop data provided"
 msgstr "No se proveyeron datos de recorte"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Lunes"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Martes"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Jueves"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Viernes"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sábado"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "enero"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "febrero"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "marzo"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "abril"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "mayo"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "junio"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "julio"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "agosto"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "septiembre"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "octubre"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "noviembre"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "diciembre"
 
@@ -192,75 +192,75 @@ msgstr "el año pasado"
 msgid "years ago"
 msgstr "años atrás"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Elegir"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Error cargando la plantilla del selector de archivo: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Elegir"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Error cargando la plantilla del selector de archivo: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Aceptar"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Error cargando la plantilla del mensaje: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "un archivo en conflicto"
 msgstr[1] "{count} archivos en conflicto"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Un archivo en conflicto"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Nuevos archivos"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "¿Qué archivos deseas retener?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Continuar"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(todos están seleccionados)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} seleccionados)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Error cargando la plantilla de archivo existente"
 
@@ -292,12 +292,12 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
@@ -325,107 +325,116 @@ msgstr "Compartir con usuario o grupo ..."
 msgid "Share link"
 msgstr "Compartir vínculo"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Proteger con contraseña "
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Contraseña"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Permitir Subida Pública"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Enviar el enlace por e-mail."
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Mandar"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Asignar fecha de vencimiento"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Fecha de vencimiento"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Compartir a través de e-mail:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "No se encontraron usuarios"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "No se permite volver a compartir"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "notificar por correo"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "podés editar"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "borrar"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Protegido por contraseña"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Error al remover la fecha de vencimiento"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Error al asignar fecha de vencimiento"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Mandando..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "e-mail mandado"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Atención"
 
@@ -669,6 +678,10 @@ msgstr "Para información sobre cómo configurar apropiadamente tu servidor, por
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear una <strong>cuenta de administrador</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Contraseña"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index b2c74fa1e8..9d5d2aad94 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -31,7 +31,7 @@ msgstr "No se pudo mover %s - Un archivo con este nombre ya existe"
 msgid "Could not move %s"
 msgstr "No se pudo mover %s "
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "El nombre del archivo no puede quedar vacío."
 
@@ -40,18 +40,18 @@ msgstr "El nombre del archivo no puede quedar vacío."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -143,28 +143,32 @@ msgstr "Falló la carga. No se pudo obtener la información del archivo."
 msgid "Invalid directory."
 msgstr "Directorio inválido."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Archivos"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Imposible cargar {filename} puesto que es un directoro o tiene 0 bytes."
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "La subida fue cancelada"
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "No se pudo obtener resultados del servidor."
 
@@ -177,131 +181,135 @@ msgstr "La subida del archivo está en proceso. Si salís de la página ahora, l
 msgid "URL cannot be empty"
 msgstr "La URL no puede estar vacía"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "No se pudo crear el archivo"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "No se pudo crear el directorio"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Error al obtener la URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Borrar permanentemente"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Cambiar nombre"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Error moviendo el archivo"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Error"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Pendientes"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Error moviendo el archivo"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Error"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "No se pudo renombrar el archivo"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Error al borrar el archivo."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nombre"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Tamaño"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Modificado"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n carpeta"
 msgstr[1] "%n carpetas"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n archivo"
 msgstr[1] "%n archivos"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{carpetas} y {archivos}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Subiendo %n archivo"
 msgstr[1] "Subiendo %n archivos"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "El almacenamiento está casi lleno ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión"
 
-#: js/files.js:136
+#: js/files.js:144
 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 "Llave privada inválida para la aplicación de encriptación. Por favor actualice la clave de la llave privada en las configuraciones personales para recobrar el acceso a sus archivos encriptados."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{carpetas} y {archivos}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nombre"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Tamaño"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Modificado"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "No se pudo renombrar %s"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -338,68 +346,75 @@ msgstr "Tamaño máximo para archivos ZIP de entrada"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Nuevo"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Nuevo archivo de texto"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Archivo de texto"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nueva Carpeta"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Carpeta"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Desde enlace"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Archivos borrados"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada. ¡Subí contenido!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Borrar"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "El tamaño del archivo que querés subir es demasiado grande"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Se están escaneando los archivos, por favor esperá."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Escaneo actual"
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index 693164f288..8d900e6f12 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 20:10+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -18,6 +18,166 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Ubicación"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Servidor"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Contraseña"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Compartir"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Acceso permitido"
@@ -42,29 +202,29 @@ msgstr "Error al configurar el almacenamiento de Google Drive"
 msgid "Saved"
 msgstr "Guardado"
 
-#: lib/config.php:598
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:608
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:630
+#: lib/config.php:621
 #, 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:632
+#: lib/config.php:623
 #, 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:634
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index aed7ae395d..b0acabd395 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +19,7 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Compartido por {owner}"
 
@@ -59,16 +59,15 @@ msgstr "compartir está desactivado"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para mayor información, contactá a la persona que te mandó el enlace."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr ""
+#: templates/public.php:21
+msgid "Download"
+msgstr "Descargar"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Vínculo directo"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index 2ee0526ef0..e23903ca58 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_AR/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "No fue posible borrar %s de manera permanente"
 msgid "Couldn't restore %s"
 msgstr "No se pudo restaurar %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Archivos borrados"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Error"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Archivos eliminados"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "recuperado"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "No hay nada acá. ¡La papelera está vacía!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nombre"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Recuperar"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Error"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "recuperado"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "No hay nada acá. ¡La papelera está vacía!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nombre"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Borrado"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Borrar"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index 8adff8cc30..65335ab4c7 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +19,15 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -75,23 +78,23 @@ msgstr "Imagen inválida"
 msgid "web services under your control"
 msgstr "servicios web sobre los que tenés control"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP está desactivada."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados de a uno."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Volver a Archivos"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -277,19 +280,19 @@ msgstr "Configurar un nombre de administrador."
 msgid "Set an admin password."
 msgstr "Configurar una contraseña de administrador."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s compartió \"%s\" con vos"
@@ -331,73 +334,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "No fue posible encontrar la categoría \"%s\""
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 7dfabe9ba2..a4f18742fd 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -51,15 +51,15 @@ msgstr "e-mail mandado"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Necesita especificar el usuario de correo electrónico antes de poder enviar correos electrónicos de prueba."
 
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Modo de envio"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Encriptación"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
@@ -102,6 +102,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "e-mail guardado"
@@ -118,6 +128,16 @@ msgstr "No fue posible borrar el grupo"
 msgid "Unable to delete user"
 msgstr "No fue posible borrar el usuario"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Idioma cambiado"
@@ -173,7 +193,7 @@ msgstr "El back-end no soporta cambios de contraseña, pero las claves de encrip
 msgid "Unable to change password"
 msgstr "Imposible cambiar la contraseña"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Enviando..."
 
@@ -229,34 +249,42 @@ msgstr "Actualizar"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Seleccionar una imágen de perfil"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Contraseña muy débil."
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Contraseña débil."
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Contraseña de nivel medio. "
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Buena contraseña. "
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Contraseña fuerte."
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Desencriptando archivos... Por favor espere, esto puede tardar."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "borrado"
@@ -302,7 +330,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Castellano (Argentina)"
 
@@ -490,148 +518,143 @@ msgstr "Permitir a las aplicaciones usar la Share API"
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Permitir subidas públicas"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Permitir Re-Compartir"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Permitir a los usuarios compartir con cualquiera."
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Permitir notificaciones por correo"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Habilitar a los usuarios para enviar notificaciones por correo para archivos compartidos"
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Permitir a los usuarios compartir enlaces públicos"
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Permitir Re-Compartir"
+
+#: templates/admin.php:253
+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:260
+msgid "Allow users to share with anyone"
+msgstr "Permitir a los usuarios compartir con cualquiera."
+
+#: templates/admin.php:263
+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:270
+msgid "Allow mail notification"
+msgstr "Permitir notificaciones por correo"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr "Habilitar a los usuarios para enviar notificaciones por correo para archivos compartidos"
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "Servidor de correo electrónico"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Esto es usado para enviar notificaciones."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Dirección remitente"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Autentificación requerida"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Dirección del servidor"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Credenciales"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "Nombre de usuario SMTP"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "Contraseña SMTP"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Configuracion de correo de prueba."
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Enviar correo"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Nivel de Log"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -784,29 +807,33 @@ msgstr "Idioma"
 msgid "Help translate"
 msgstr "Ayudanos a traducir"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Clave de acceso"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Desencriptar todos los archivos"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Nombre de Usuario"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index aac34c4668..3d139c36af 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 20:00+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
 "Last-Translator: Javier Victor Mariano Bruno <koryyyy@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -129,25 +129,25 @@ msgstr "¿Realmente desea borrar la configuración actual del servidor?"
 msgid "Confirm Deletion"
 msgstr "Confirmar borrado"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s grupo encontrado"
 msgstr[1] "%s grupos encontrados"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s usuario encontrado"
 msgstr[1] "%s usuarios encontrados"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Host inválido"
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "No se pudo encontrar la característica deseada"
 
diff --git a/l10n/es_BO/core.po b/l10n/es_BO/core.po
new file mode 100644
index 0000000000..9548073849
--- /dev/null
+++ b/l10n/es_BO/core.po
@@ -0,0 +1,818 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:483
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:583
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1240
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1241
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1242
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1243
+msgid "today"
+msgstr ""
+
+#: js/js.js:1244
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1245
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1246
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1247
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1248
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1249
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+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:761
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:160 js/share.js:824
+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:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:289
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:292
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:336 js/share.js:397
+msgid "group"
+msgstr ""
+
+#: js/share.js:369
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:413
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:435
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:443
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:446
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:448
+msgid "access control"
+msgstr ""
+
+#: js/share.js:451
+msgid "create"
+msgstr ""
+
+#: js/share.js:454
+msgid "update"
+msgstr ""
+
+#: js/share.js:457
+msgid "delete"
+msgstr ""
+
+#: js/share.js:460
+msgid "share"
+msgstr ""
+
+#: js/share.js:742
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:761
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:782
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:811
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:822
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:846
+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:264
+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:60 templates/login.php:40
+msgid "Password"
+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/es_BO/files.po b/l10n/es_BO/files.po
new file mode 100644
index 0000000000..ba506d853c
--- /dev/null
+++ b/l10n/es_BO/files.po
@@ -0,0 +1,416 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\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:103
+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:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, 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:169
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:179
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:194
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1672
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1335
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1580 js/filelist.js:1619
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+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:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+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/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/es_BO/files_encryption.po b/l10n/es_BO/files_encryption.po
new file mode 100644
index 0000000000..f8102a5762
--- /dev/null
+++ b/l10n/es_BO/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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\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/es_BO/files_external.po b/l10n/es_BO/files_external.po
new file mode 100644
index 0000000000..404b32bb20
--- /dev/null
+++ b/l10n/es_BO/files_external.po
@@ -0,0 +1,296 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: 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:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, 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:623
+#, 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:625
+#, 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/es_BO/files_sharing.po b/l10n/es_BO/files_sharing.po
new file mode 100644
index 0000000000..640415d8df
--- /dev/null
+++ b/l10n/es_BO/files_sharing.po
@@ -0,0 +1,71 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/es_BO/files_trashbin.po b/l10n/es_BO/files_trashbin.po
new file mode 100644
index 0000000000..45636e70b7
--- /dev/null
+++ b/l10n/es_BO/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\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 ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/es_BO/files_versions.po b/l10n/es_BO/files_versions.po
new file mode 100644
index 0000000000..85f9f1ec38
--- /dev/null
+++ b/l10n/es_BO/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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\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/es_BO/lib.po b/l10n/es_BO/lib.po
new file mode 100644
index 0000000000..067999cc7b
--- /dev/null
+++ b/l10n/es_BO/lib.po
@@ -0,0 +1,476 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:685
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: 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:880
+#, 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:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+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:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+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:164
+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:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:498
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:523
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:529
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:538
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:551 private/share/share.php:579
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:559
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:566
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:645
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:783
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:844
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:955
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:962
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:968
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1383
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1392
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1407
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1419
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1433
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_BO/settings.po b/l10n/es_BO/settings.po
new file mode 100644
index 0000000000..716cd6522c
--- /dev/null
+++ b/l10n/es_BO/settings.po
@@ -0,0 +1,885 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\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:317
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:354
+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/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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: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:81
+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:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:50 personal.php:51
+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:223
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:230
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:235
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:292
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:294
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:300
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:312
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:314
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:345
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:367
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:380
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:381
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:384
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:388
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:389
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:394
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:395
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:427
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:428
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:434 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:438 templates/personal.php:199
+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:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+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/es_BO/user_ldap.po b/l10n/es_BO/user_ldap.po
new file mode 100644
index 0000000000..504916d579
--- /dev/null
+++ b/l10n/es_BO/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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\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:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:83 lib/wizard.php:97
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:130
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:825 lib/wizard.php:837
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:1025
+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 insensitive 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/es_BO/user_webdavauth.po b/l10n/es_BO/user_webdavauth.po
new file mode 100644
index 0000000000..5af85b322f
--- /dev/null
+++ b/l10n/es_BO/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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\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/es_CL/core.po b/l10n/es_CL/core.po
index 0ea25ef3cb..372059ba90 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -59,207 +59,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Lunes"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Martes"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Jueves"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Viernes"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sábado"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Enero"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Febrero"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Marzo"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Abril"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mayo"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Junio"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Julio"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Agosto"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Septiembre"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Octubre"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Noviembre"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Diciembre"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Configuración"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "segundos antes"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "mes anterior"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "último año"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "años anteriores"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Choose"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Si"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Choose"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,12 +291,12 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Ocurrió un error mientras compartía"
 
@@ -324,107 +324,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Clave"
-
-#: 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -668,6 +677,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Clave"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/es_CL/files.po b/l10n/es_CL/files.po
index a9a51c8525..c6f4fe2069 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Archivos"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Renombrar"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Error"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Error"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nuevo directorio"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
-msgstr ""
+msgstr "cancelar subida"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/es_CL/files_external.po b/l10n/es_CL/files_external.po
index 42e6ef6634..9f16e37512 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 16:20+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Usuario"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Clave"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Compartir"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:598
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:608
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:630
+#: lib/config.php:621
 #, 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:632
+#: lib/config.php:623
 #, 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:634
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/es_CL/files_sharing.po b/l10n/es_CL/files_sharing.po
index 90d1afb2ff..74f45fbb7b 100644
--- a/l10n/es_CL/files_sharing.po
+++ b/l10n/es_CL/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Descargar"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/es_CL/files_trashbin.po b/l10n/es_CL/files_trashbin.po
index b63a2d60db..5c5859e10b 100644
--- a/l10n/es_CL/files_trashbin.po
+++ b/l10n/es_CL/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Error"
-
-#: 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 ""
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Error"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
diff --git a/l10n/es_CL/lib.po b/l10n/es_CL/lib.po
index 30f14c86d0..60f3181395 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/es_CL/settings.po b/l10n/es_CL/settings.po
index 67911da128..e638a61ab4 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/es_CL/user_ldap.po b/l10n/es_CL/user_ldap.po
index c37ef034eb..4469087816 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr[1] ""
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:984
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/es_CO/core.po b/l10n/es_CO/core.po
new file mode 100644
index 0000000000..5caf580cd7
--- /dev/null
+++ b/l10n/es_CO/core.po
@@ -0,0 +1,818 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:483
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:583
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1240
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1241
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1242
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1243
+msgid "today"
+msgstr ""
+
+#: js/js.js:1244
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1245
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1246
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1247
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1248
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1249
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+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:761
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:160 js/share.js:824
+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:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:289
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:292
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:336 js/share.js:397
+msgid "group"
+msgstr ""
+
+#: js/share.js:369
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:413
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:435
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:443
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:446
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:448
+msgid "access control"
+msgstr ""
+
+#: js/share.js:451
+msgid "create"
+msgstr ""
+
+#: js/share.js:454
+msgid "update"
+msgstr ""
+
+#: js/share.js:457
+msgid "delete"
+msgstr ""
+
+#: js/share.js:460
+msgid "share"
+msgstr ""
+
+#: js/share.js:742
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:761
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:782
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:811
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:822
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:846
+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:264
+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:60 templates/login.php:40
+msgid "Password"
+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/es_CO/files.po b/l10n/es_CO/files.po
new file mode 100644
index 0000000000..7ae4786ac9
--- /dev/null
+++ b/l10n/es_CO/files.po
@@ -0,0 +1,416 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\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:103
+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:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, 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:169
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:179
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:194
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1672
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1335
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1580 js/filelist.js:1619
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+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:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+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/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/es_CO/files_encryption.po b/l10n/es_CO/files_encryption.po
new file mode 100644
index 0000000000..38d38dd421
--- /dev/null
+++ b/l10n/es_CO/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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\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/es_CO/files_external.po b/l10n/es_CO/files_external.po
new file mode 100644
index 0000000000..9283400210
--- /dev/null
+++ b/l10n/es_CO/files_external.po
@@ -0,0 +1,296 @@
+# 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-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: 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:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, 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:623
+#, 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:625
+#, 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/es_CO/files_sharing.po b/l10n/es_CO/files_sharing.po
new file mode 100644
index 0000000000..9388ab8e1d
--- /dev/null
+++ b/l10n/es_CO/files_sharing.po
@@ -0,0 +1,71 @@
+# 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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/es_CO/files_trashbin.po b/l10n/es_CO/files_trashbin.po
new file mode 100644
index 0000000000..c365643a98
--- /dev/null
+++ b/l10n/es_CO/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\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 ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/es_CO/files_versions.po b/l10n/es_CO/files_versions.po
new file mode 100644
index 0000000000..d050fb2f15
--- /dev/null
+++ b/l10n/es_CO/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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\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/es_CO/lib.po b/l10n/es_CO/lib.po
new file mode 100644
index 0000000000..0fbcd09439
--- /dev/null
+++ b/l10n/es_CO/lib.po
@@ -0,0 +1,476 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:685
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: 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:880
+#, 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:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+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:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+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:164
+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:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:498
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:523
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:529
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:538
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:551 private/share/share.php:579
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:559
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:566
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:645
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:783
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:844
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:955
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:962
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:968
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1383
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1392
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1407
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1419
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1433
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_CO/settings.po b/l10n/es_CO/settings.po
new file mode 100644
index 0000000000..85571a6ff6
--- /dev/null
+++ b/l10n/es_CO/settings.po
@@ -0,0 +1,885 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\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:317
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:354
+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/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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: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:81
+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:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:50 personal.php:51
+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:223
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:230
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:235
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:292
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:294
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:300
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:312
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:314
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:345
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:367
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:380
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:381
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:384
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:388
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:389
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:394
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:395
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:427
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:428
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:434 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:438 templates/personal.php:199
+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:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+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/es_CO/user_ldap.po b/l10n/es_CO/user_ldap.po
new file mode 100644
index 0000000000..1d388d6e53
--- /dev/null
+++ b/l10n/es_CO/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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\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:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+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:984
+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 insensitive 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/es_CO/user_webdavauth.po b/l10n/es_CO/user_webdavauth.po
new file mode 100644
index 0000000000..71497a4268
--- /dev/null
+++ b/l10n/es_CO/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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\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/es_CR/core.po b/l10n/es_CR/core.po
index bc873a1313..db9524f4ca 100644
--- a/l10n/es_CR/core.po
+++ b/l10n/es_CR/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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
 "MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/es_CR/files.po b/l10n/es_CR/files.po
index b1af60b243..8678be146d 100644
--- a/l10n/es_CR/files.po
+++ b/l10n/es_CR/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/es_CR/files_external.po b/l10n/es_CR/files_external.po
index 267cf48a03..29cb37c29d 100644
--- a/l10n/es_CR/files_external.po
+++ b/l10n/es_CR/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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 22:45+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,166 @@ msgstr ""
 "Language: es_CR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:598
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:608
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:630
+#: lib/config.php:621
 #, 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:632
+#: lib/config.php:623
 #, 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:634
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/es_CR/files_sharing.po b/l10n/es_CR/files_sharing.po
index 904ff6bff9..f13bac5cf8 100644
--- a/l10n/es_CR/files_sharing.po
+++ b/l10n/es_CR/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 22:45+0000\n"
+"POT-Creation-Date: 2014-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 05:55+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
 "MIME-Version: 1.0\n"
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/es_CR/files_trashbin.po b/l10n/es_CR/files_trashbin.po
index 4b692737a2..166ec3406f 100644
--- a/l10n/es_CR/files_trashbin.po
+++ b/l10n/es_CR/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 22:45+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
 "MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr ""
-
-#: js/trash.js:62 templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: js/trash.js:264
-msgid "Deleted Files"
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
 msgstr ""
 
 #: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:19
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:30
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
diff --git a/l10n/es_CR/lib.po b/l10n/es_CR/lib.po
index 6560ae17ea..c5013389c8 100644
--- a/l10n/es_CR/lib.po
+++ b/l10n/es_CR/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,15 @@ msgstr ""
 "Language: es_CR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/es_CR/settings.po b/l10n/es_CR/settings.po
index 2720f55063..df6aeb1d5d 100644
--- a/l10n/es_CR/settings.po
+++ b/l10n/es_CR/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/es_EC/core.po b/l10n/es_EC/core.po
new file mode 100644
index 0000000000..c11d308eab
--- /dev/null
+++ b/l10n/es_EC/core.po
@@ -0,0 +1,818 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:483
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:583
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1240
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1241
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1242
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1243
+msgid "today"
+msgstr ""
+
+#: js/js.js:1244
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1245
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1246
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1247
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1248
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1249
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+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:761
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:160 js/share.js:824
+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:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:289
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:292
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:336 js/share.js:397
+msgid "group"
+msgstr ""
+
+#: js/share.js:369
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:413
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:435
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:443
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:446
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:448
+msgid "access control"
+msgstr ""
+
+#: js/share.js:451
+msgid "create"
+msgstr ""
+
+#: js/share.js:454
+msgid "update"
+msgstr ""
+
+#: js/share.js:457
+msgid "delete"
+msgstr ""
+
+#: js/share.js:460
+msgid "share"
+msgstr ""
+
+#: js/share.js:742
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:761
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:782
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:811
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:822
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:846
+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:264
+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:60 templates/login.php:40
+msgid "Password"
+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/es_EC/files.po b/l10n/es_EC/files.po
new file mode 100644
index 0000000000..36a71f42fe
--- /dev/null
+++ b/l10n/es_EC/files.po
@@ -0,0 +1,416 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\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:103
+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:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, 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:169
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:179
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:194
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1672
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1335
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1580 js/filelist.js:1619
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+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:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+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/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/es_EC/files_encryption.po b/l10n/es_EC/files_encryption.po
new file mode 100644
index 0000000000..82fdfa92ee
--- /dev/null
+++ b/l10n/es_EC/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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\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/es_EC/files_external.po b/l10n/es_EC/files_external.po
new file mode 100644
index 0000000000..fedf842aa1
--- /dev/null
+++ b/l10n/es_EC/files_external.po
@@ -0,0 +1,296 @@
+# 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-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: 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:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, 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:623
+#, 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:625
+#, 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/es_EC/files_sharing.po b/l10n/es_EC/files_sharing.po
new file mode 100644
index 0000000000..1f4120b72c
--- /dev/null
+++ b/l10n/es_EC/files_sharing.po
@@ -0,0 +1,71 @@
+# 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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/es_EC/files_trashbin.po b/l10n/es_EC/files_trashbin.po
new file mode 100644
index 0000000000..fdf0281b7e
--- /dev/null
+++ b/l10n/es_EC/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\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 ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/es_EC/files_versions.po b/l10n/es_EC/files_versions.po
new file mode 100644
index 0000000000..1aedfd7f79
--- /dev/null
+++ b/l10n/es_EC/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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\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/es_EC/lib.po b/l10n/es_EC/lib.po
new file mode 100644
index 0000000000..a21fa2932b
--- /dev/null
+++ b/l10n/es_EC/lib.po
@@ -0,0 +1,476 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:685
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: 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:880
+#, 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:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+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:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+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:164
+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:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:498
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:523
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:529
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:538
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:551 private/share/share.php:579
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:559
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:566
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:645
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:783
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:844
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:955
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:962
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:968
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1383
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1392
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1407
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1419
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1433
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_EC/settings.po b/l10n/es_EC/settings.po
new file mode 100644
index 0000000000..df8299f931
--- /dev/null
+++ b/l10n/es_EC/settings.po
@@ -0,0 +1,885 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\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:317
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:354
+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/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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: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:81
+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:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:50 personal.php:51
+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:223
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:230
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:235
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:292
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:294
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:300
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:312
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:314
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:345
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:367
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:380
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:381
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:384
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:388
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:389
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:394
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:395
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:427
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:428
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:434 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:438 templates/personal.php:199
+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:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+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/es_EC/user_ldap.po b/l10n/es_EC/user_ldap.po
new file mode 100644
index 0000000000..2f2e6dd659
--- /dev/null
+++ b/l10n/es_EC/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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\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:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+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:984
+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 insensitive 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/es_EC/user_webdavauth.po b/l10n/es_EC/user_webdavauth.po
new file mode 100644
index 0000000000..a92cd9987b
--- /dev/null
+++ b/l10n/es_EC/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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\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/es_MX/core.po b/l10n/es_MX/core.po
index 50fd808eba..ee6a340f5a 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr "No hay disponible una imagen temporal de perfil, pruebe de nuevo"
 msgid "No crop data provided"
 msgstr "No se proporcionó datos del recorte"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Lunes"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Martes"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Jueves"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Viernes"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sábado"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Enero"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Febrero"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Marzo"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Abril"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mayo"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Junio"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Julio"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Agosto"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Septiembre"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Octubre"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Noviembre"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Diciembre"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "segundos antes"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Hace %n minuto"
 msgstr[1] "Hace %n minutos"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Hace %n hora"
 msgstr[1] "Hace %n horas"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Hace %n día"
 msgstr[1] "Hace %n días"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Hace %n mes"
 msgstr[1] "Hace %n meses"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "años antes"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Seleccionar"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Error cargando plantilla del seleccionador de archivos: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Seleccionar"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Error cargando plantilla del seleccionador de archivos: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Aceptar"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Error cargando plantilla del mensaje: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} conflicto de archivo"
 msgstr[1] "{count} conflictos de archivo"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Un conflicto de archivo"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "¿Que archivos deseas mantener?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Continuar"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(todos seleccionados)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} seleccionados)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Error cargando plantilla de archivo existente"
 
@@ -290,12 +290,12 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
@@ -323,107 +323,116 @@ msgstr "Compartido con el usuario o con el grupo …"
 msgid "Share link"
 msgstr "Enlace compartido"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Protección con contraseña"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Contraseña"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Permitir Subida Pública"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Enviar enlace por correo electrónico a una persona"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Establecer fecha de caducidad"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Fecha de caducidad"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Compartir por correo electrónico:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "No se encontró gente"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "No se permite compartir de nuevo"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "notificar al usuario por correo electrónico"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "puede editar"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Protegido con contraseña"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Error eliminando fecha de caducidad"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Error estableciendo fecha de caducidad"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Correo electrónico enviado"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Precaución"
 
@@ -667,6 +676,10 @@ msgstr "Para información de cómo configurar apropiadamente su servidor, por fa
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear una <strong>cuenta de administrador</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Contraseña"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/es_MX/files.po b/l10n/es_MX/files.po
index 1ab396c0c2..f0990b9937 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -27,7 +27,7 @@ msgstr "No se pudo mover %s - Ya existe un archivo con ese nombre."
 msgid "Could not move %s"
 msgstr "No se pudo mover %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "El nombre de archivo no puede estar vacío."
 
@@ -36,18 +36,18 @@ msgstr "El nombre de archivo no puede estar vacío."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos "
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr "Actualización fallida. No se pudo obtener información del archivo."
 msgid "Invalid directory."
 msgstr "Directorio inválido."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Archivos"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "No se pudo obtener respuesta del servidor."
 
@@ -173,131 +177,135 @@ msgstr "La subida del archivo está en proceso. Si sale de la página ahora, la
 msgid "URL cannot be empty"
 msgstr "La dirección URL no puede estar vacía"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "No se pudo crear el archivo"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "No se pudo crear la carpeta"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Error al descargar URL."
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Renombrar"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Error moviendo archivo"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Error"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Error moviendo archivo"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Error"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "No se pudo renombrar el archivo"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Error borrando el archivo."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nombre"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Tamaño"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Modificado"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n carpeta"
 msgstr[1] "%n carpetas"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n archivo"
 msgstr[1] "%n archivos"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} y {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Subiendo %n archivo"
 msgstr[1] "Subiendo %n archivos"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo."
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "La clave privada no es válida para la aplicación de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} y {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nombre"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Tamaño"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Modificado"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s no pudo ser renombrado"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr "Tamaño máximo para archivos ZIP de entrada"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Nuevo"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Nuevo archivo de texto"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Archivo de texto"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Carpeta"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Desde enlace"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Archivos eliminados"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada aquí. ¡Suba algo!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Subida demasido grande"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Los archivos están siendo escaneados,  por favor espere."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Escaneo actual"
diff --git a/l10n/es_MX/files_external.po b/l10n/es_MX/files_external.po
index 85a74353c1..7d2d571bab 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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,6 +17,166 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Ubicación"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Servidor"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Contraseña"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Compartir"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Acceso concedido"
@@ -41,29 +201,29 @@ msgstr "Error configurando el almacenamiento de Google Drive"
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/es_MX/files_sharing.po b/l10n/es_MX/files_sharing.po
index f4faa22eba..5f42f5454a 100644
--- a/l10n/es_MX/files_sharing.po
+++ b/l10n/es_MX/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Compartido por {owner}"
 
@@ -57,16 +57,15 @@ msgstr "compartir está desactivado"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para mayor información, contacte a la persona que le envió el enlace."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr ""
+#: templates/public.php:21
+msgid "Download"
+msgstr "Descargar"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Enlace directo"
diff --git a/l10n/es_MX/files_trashbin.po b/l10n/es_MX/files_trashbin.po
index ba1c8ca747..c5657a3c58 100644
--- a/l10n/es_MX/files_trashbin.po
+++ b/l10n/es_MX/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 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"
@@ -27,38 +27,34 @@ msgstr "No se puede eliminar %s permanentemente"
 msgid "Couldn't restore %s"
 msgstr "No se puede restaurar %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Archivos eliminados"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Error"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Archivos Eliminados"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "recuperado"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "No hay nada aquí. ¡Tu papelera esta vacía!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nombre"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Recuperar"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Error"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "recuperado"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "No hay nada aquí. ¡Tu papelera esta vacía!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nombre"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Eliminar"
diff --git a/l10n/es_MX/lib.po b/l10n/es_MX/lib.po
index 194c2c95a9..f47621828b 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr "Imagen inválida"
 msgid "web services under your control"
 msgstr "Servicios web bajo su control"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP está desactivada."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados uno por uno."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Volver a Archivos"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr "Configurar un nombre de usuario del administrador"
 msgid "Set an admin password."
 msgstr "Configurar la contraseña del administrador."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s ha compartido  »%s« contigo"
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "No puede encontrar la categoria \"%s\""
diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po
index a9e751dcaf..67be8d27a7 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Correo electrónico guardado"
@@ -114,6 +124,16 @@ msgstr "No se pudo eliminar el grupo"
 msgid "Unable to delete user"
 msgstr "No se pudo eliminar el usuario"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Idioma cambiado"
@@ -169,7 +189,7 @@ msgstr "El back-end no soporta cambios de contraseña, pero la clave de cifrado
 msgid "Unable to change password"
 msgstr "No se ha podido cambiar la contraseña"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr "Actualizar"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Seleccionar una imagen de perfil"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "eliminado"
@@ -298,7 +326,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Español (México)"
 
@@ -486,148 +514,143 @@ msgstr "Permitir a las aplicaciones utilizar la API de Compartición"
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Permitir subidas públicas"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Permitir re-compartición"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Permitir a los usuarios compartir con cualquier persona"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Permitir notificaciones por correo electrónico"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+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:252
+msgid "Allow resharing"
+msgstr "Permitir re-compartición"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Permitir a los usuarios compartir de nuevo elementos ya compartidos"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Permitir a los usuarios compartir con cualquier persona"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
+msgstr "Permitir notificaciones por correo electrónico"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Dirección del servidor"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Nivel de registro"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr "Idioma"
 msgid "Help translate"
 msgstr "Ayúdanos a traducir"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Contraseña de acceso"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Descifrar archivos"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Nombre de usuario"
diff --git a/l10n/es_MX/user_ldap.po b/l10n/es_MX/user_ldap.po
index ddbe0ce251..a58037965d 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -86,65 +86,65 @@ msgstr "Éxito"
 msgid "Error"
 msgstr "Error"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuración OK"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Configuración Incorrecta"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Configuración incompleta"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Seleccionar grupos"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Seleccionar la clase de objeto"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Seleccionar atributos"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "La prueba de conexión fue exitosa"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "La prueba de conexión falló"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "¿Realmente desea eliminar la configuración actual del servidor?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Confirmar eliminación"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "Grupo %s encontrado"
 msgstr[1] "Grupos %s encontrados"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "Usuario %s encontrado"
 msgstr[1] "Usuarios %s encontrados"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Host inválido"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "No se puede encontrar la función deseada."
 
diff --git a/l10n/es_PE/core.po b/l10n/es_PE/core.po
new file mode 100644
index 0000000000..31019c4866
--- /dev/null
+++ b/l10n/es_PE/core.po
@@ -0,0 +1,818 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:483
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:583
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1240
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1241
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1242
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1243
+msgid "today"
+msgstr ""
+
+#: js/js.js:1244
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1245
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1246
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1247
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1248
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1249
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+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:761
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:160 js/share.js:824
+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:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:289
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:292
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:336 js/share.js:397
+msgid "group"
+msgstr ""
+
+#: js/share.js:369
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:413
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:435
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:443
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:446
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:448
+msgid "access control"
+msgstr ""
+
+#: js/share.js:451
+msgid "create"
+msgstr ""
+
+#: js/share.js:454
+msgid "update"
+msgstr ""
+
+#: js/share.js:457
+msgid "delete"
+msgstr ""
+
+#: js/share.js:460
+msgid "share"
+msgstr ""
+
+#: js/share.js:742
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:761
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:782
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:811
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:822
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:846
+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:264
+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:60 templates/login.php:40
+msgid "Password"
+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/es_PE/files.po b/l10n/es_PE/files.po
new file mode 100644
index 0000000000..35b06bcd14
--- /dev/null
+++ b/l10n/es_PE/files.po
@@ -0,0 +1,416 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\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:103
+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:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, 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:169
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:179
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:194
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1672
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1335
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1580 js/filelist.js:1619
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+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:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+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/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/es_PE/files_encryption.po b/l10n/es_PE/files_encryption.po
new file mode 100644
index 0000000000..b2e26fe785
--- /dev/null
+++ b/l10n/es_PE/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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\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/es_PE/files_external.po b/l10n/es_PE/files_external.po
new file mode 100644
index 0000000000..74e4e2fc5a
--- /dev/null
+++ b/l10n/es_PE/files_external.po
@@ -0,0 +1,296 @@
+# 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-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: 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:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, 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:623
+#, 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:625
+#, 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/es_PE/files_sharing.po b/l10n/es_PE/files_sharing.po
new file mode 100644
index 0000000000..a6a1137866
--- /dev/null
+++ b/l10n/es_PE/files_sharing.po
@@ -0,0 +1,71 @@
+# 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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/es_PE/files_trashbin.po b/l10n/es_PE/files_trashbin.po
new file mode 100644
index 0000000000..4c1e50db17
--- /dev/null
+++ b/l10n/es_PE/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\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 ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/es_PE/files_versions.po b/l10n/es_PE/files_versions.po
new file mode 100644
index 0000000000..2c25cb4b9d
--- /dev/null
+++ b/l10n/es_PE/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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\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/es_PE/lib.po b/l10n/es_PE/lib.po
new file mode 100644
index 0000000000..a3eff8cc29
--- /dev/null
+++ b/l10n/es_PE/lib.po
@@ -0,0 +1,476 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:685
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: 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:880
+#, 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:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+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:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+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:164
+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:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:498
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:523
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:529
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:538
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:551 private/share/share.php:579
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:559
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:566
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:645
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:783
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:844
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:955
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:962
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:968
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1383
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1392
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1407
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1419
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1433
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_PE/settings.po b/l10n/es_PE/settings.po
new file mode 100644
index 0000000000..102c98275d
--- /dev/null
+++ b/l10n/es_PE/settings.po
@@ -0,0 +1,885 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\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:317
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:354
+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/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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: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:81
+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:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:50 personal.php:51
+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:223
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:230
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:235
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:292
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:294
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:300
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:312
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:314
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:345
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:367
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:380
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:381
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:384
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:388
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:389
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:394
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:395
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:427
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:428
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:434 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:438 templates/personal.php:199
+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:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+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/es_PE/user_ldap.po b/l10n/es_PE/user_ldap.po
new file mode 100644
index 0000000000..b7c7ddffd6
--- /dev/null
+++ b/l10n/es_PE/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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\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:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+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:984
+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 insensitive 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/es_PE/user_webdavauth.po b/l10n/es_PE/user_webdavauth.po
new file mode 100644
index 0000000000..f489730aaf
--- /dev/null
+++ b/l10n/es_PE/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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\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/es_UY/core.po b/l10n/es_UY/core.po
new file mode 100644
index 0000000000..8f6919d8b1
--- /dev/null
+++ b/l10n/es_UY/core.po
@@ -0,0 +1,818 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:483
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:583
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1240
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1241
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1242
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1243
+msgid "today"
+msgstr ""
+
+#: js/js.js:1244
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1245
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1246
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1247
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1248
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1249
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+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:761
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:160 js/share.js:824
+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:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:289
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:292
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:336 js/share.js:397
+msgid "group"
+msgstr ""
+
+#: js/share.js:369
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:413
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:435
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:443
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:446
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:448
+msgid "access control"
+msgstr ""
+
+#: js/share.js:451
+msgid "create"
+msgstr ""
+
+#: js/share.js:454
+msgid "update"
+msgstr ""
+
+#: js/share.js:457
+msgid "delete"
+msgstr ""
+
+#: js/share.js:460
+msgid "share"
+msgstr ""
+
+#: js/share.js:742
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:761
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:782
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:811
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:822
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:846
+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:264
+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:60 templates/login.php:40
+msgid "Password"
+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/es_UY/files.po b/l10n/es_UY/files.po
new file mode 100644
index 0000000000..7fca6560dc
--- /dev/null
+++ b/l10n/es_UY/files.po
@@ -0,0 +1,416 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\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:103
+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:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, 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:169
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:179
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:194
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1672
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1335
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1580 js/filelist.js:1619
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+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:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+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/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/es_UY/files_encryption.po b/l10n/es_UY/files_encryption.po
new file mode 100644
index 0000000000..a2ea551480
--- /dev/null
+++ b/l10n/es_UY/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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\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/es_UY/files_external.po b/l10n/es_UY/files_external.po
new file mode 100644
index 0000000000..bde03579aa
--- /dev/null
+++ b/l10n/es_UY/files_external.po
@@ -0,0 +1,296 @@
+# 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-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: 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:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, 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:623
+#, 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:625
+#, 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/es_UY/files_sharing.po b/l10n/es_UY/files_sharing.po
new file mode 100644
index 0000000000..845923caf5
--- /dev/null
+++ b/l10n/es_UY/files_sharing.po
@@ -0,0 +1,71 @@
+# 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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/es_UY/files_trashbin.po b/l10n/es_UY/files_trashbin.po
new file mode 100644
index 0000000000..2ec1edc742
--- /dev/null
+++ b/l10n/es_UY/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\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 ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/es_UY/files_versions.po b/l10n/es_UY/files_versions.po
new file mode 100644
index 0000000000..db19308416
--- /dev/null
+++ b/l10n/es_UY/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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\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/es_UY/lib.po b/l10n/es_UY/lib.po
new file mode 100644
index 0000000000..ea73d4c22e
--- /dev/null
+++ b/l10n/es_UY/lib.po
@@ -0,0 +1,476 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:685
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: 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:880
+#, 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:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+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:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+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:164
+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:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:498
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:523
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:529
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:538
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:551 private/share/share.php:579
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:559
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:566
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:645
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:783
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:844
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:955
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:962
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:968
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1383
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1392
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1407
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1419
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1433
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_UY/settings.po b/l10n/es_UY/settings.po
new file mode 100644
index 0000000000..d5ae025b40
--- /dev/null
+++ b/l10n/es_UY/settings.po
@@ -0,0 +1,885 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\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:317
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:354
+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/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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: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:81
+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:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:50 personal.php:51
+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:223
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:230
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:235
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:292
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:294
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:300
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:312
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:314
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:345
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:367
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:380
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:381
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:384
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:388
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:389
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:394
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:395
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:427
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:428
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:434 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:438 templates/personal.php:199
+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:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+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/es_UY/user_ldap.po b/l10n/es_UY/user_ldap.po
new file mode 100644
index 0000000000..f25bfb85e5
--- /dev/null
+++ b/l10n/es_UY/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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\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:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+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:984
+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 insensitive 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/es_UY/user_webdavauth.po b/l10n/es_UY/user_webdavauth.po
new file mode 100644
index 0000000000..d6d6f0b54a
--- /dev/null
+++ b/l10n/es_UY/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-05-10 01:55-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\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/et_EE/core.po b/l10n/et_EE/core.po
index 8ae59371b0..6607f9820d 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 12:31+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,79 +60,79 @@ msgstr "Ühtegi ajutist profiili pilti pole saadaval, proovi uuesti"
 msgid "No crop data provided"
 msgstr "Lõikeandmeid ei leitud"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Esmaspäev"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Teisipäev"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Neljapäev"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Reede"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Laupäev"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Jaanuar"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Veebruar"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Märts"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Aprill"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Juuni"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Juuli"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "August"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktoober"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Detsember"
 
@@ -192,75 +192,75 @@ msgstr "viimasel aastal"
 msgid "years ago"
 msgstr "aastat tagasi"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Vali"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Viga failivalija malli laadimisel:  {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Jah"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Ei"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Vali"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Viga failivalija malli laadimisel:  {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Viga sõnumi malli laadimisel: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} failikonflikt"
 msgstr[1] "{count} failikonflikti"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Üks failikonflikt"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Uued failid"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Juba olemasolevad failid"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Milliseid faile sa soovid alles hoida?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Loobu"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Jätka"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(kõik valitud)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} valitud)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Viga faili olemasolu malli laadimisel"
 
@@ -292,12 +292,12 @@ msgstr "Jagatud"
 msgid "Share"
 msgstr "Jaga"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Viga"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Viga jagamisel"
 
@@ -325,107 +325,116 @@ msgstr "Jaga kasutaja või grupiga ..."
 msgid "Share link"
 msgstr "Jaga linki"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Parool"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Luba avalik üleslaadimine"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Saada link isikule e-postiga"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Saada"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Määra aegumise kuupäev"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Aegumise kuupäev"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Jaga e-postiga:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Ühtegi inimest ei leitud"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grupp"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Edasijagamine pole lubatud"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Jagatud {item} kasutajaga {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Lõpeta jagamine"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "teavita e-postiga"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "saab muuta"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "ligipääsukontroll"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "loo"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "uuenda"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "kustuta"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "jaga"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Viga aegumise kuupäeva eemaldamisel"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Viga aegumise kuupäeva määramisel"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Saatmine ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "E-kiri on saadetud"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Hoiatus"
 
@@ -669,6 +678,10 @@ msgstr "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_bl
 msgid "Create an <strong>admin account</strong>"
 msgstr "Loo <strong>admini konto</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Parool"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Andmehoidla ja andmebaas"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index e6a6612c79..407053f6a2 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -29,7 +29,7 @@ msgstr "Ei saa liigutada faili %s - samanimeline fail on juba olemas"
 msgid "Could not move %s"
 msgstr "%s liigutamine ebaõnnestus"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Faili nimi ei saa olla tühi."
 
@@ -38,18 +38,18 @@ msgstr "Faili nimi ei saa olla tühi."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" on vigane failinimi."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Sihtkataloog on ümber tõstetud või kustutatud."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -141,28 +141,32 @@ msgstr "Üleslaadimine ebaõnnestus. Faili info hankimine ebaõnnestus."
 msgid "Invalid directory."
 msgstr "Vigane kaust."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Failid"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Faili suurus {size1} ületab faili üleslaadimise mahu piirangu {size2}."
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval."
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Üleslaadimine tühistati."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Serverist ei saadud tulemusi"
 
@@ -175,131 +179,135 @@ msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle ülesla
 msgid "URL cannot be empty"
 msgstr "URL ei saa olla tühi"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} on juba olemas"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Ei suuda luua faili"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Ei suuda luua kataloogi"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Viga URL-i haaramisel"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Jaga"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Kustuta jäädavalt"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Nimeta ümber"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Viga faili eemaldamisel"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Viga"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Viga faili eemaldamisel"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Viga"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Ei suuda faili ümber nimetada"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Viga faili kustutamisel."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nimi"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Suurus"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Muudetud"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n kataloog"
 msgstr[1] "%n kataloogi"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fail"
 msgstr[1] "%n faili"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} ja {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Laadin üles %n faili"
 msgstr[1] "Laadin üles %n faili"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" on vigane failinimi."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Su andmemaht on peaaegu täis ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse."
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} ja {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nimi"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Suurus"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Muudetud"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s ümbernimetamine ebaõnnestus"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Üleslaadimine (max. %s)"
@@ -336,68 +344,75 @@ msgstr "Maksimaalne ZIP-faili sisestatava faili suurus"
 msgid "Save"
 msgstr "Salvesta"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Uus"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Uus tekstifail"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Tekstifail"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Kaust"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Allikast"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Kustutatud failid"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Tühista üleslaadimine"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Siin pole midagi. Lae midagi üles!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Kustuta"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Üleslaadimine on liiga suur"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Faile skannitakse, palun oota."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Praegune skannimine"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index ec9288de57..5ac3dae6a1 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 12:31+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,166 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Kohalik"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Asukoht"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Kasutajanimi"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Parool"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Jaga"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Ligipääs on antud"
@@ -43,29 +203,29 @@ msgstr "Viga Google Drive'i salvestusruumi seadistamisel"
 msgid "Saved"
 msgstr "Salvestatud"
 
-#: lib/config.php:598
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Märkus:</b>"
 
-#: lib/config.php:608
+#: lib/config.php:599
 msgid " and "
 msgstr "ja"
 
-#: lib/config.php:630
+#: lib/config.php:621
 #, 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 "<b>Märkus:</b> cURL tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata cURL tugi."
 
-#: lib/config.php:632
+#: lib/config.php:623
 #, 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 "<b>Märkus:</b> FTP tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi."
 
-#: lib/config.php:634
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 65ad0cac72..db936bfcdf 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 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"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Jagas {owner}"
 
@@ -59,16 +59,15 @@ msgstr "jagamine on peatatud"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "jagas %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Lae alla"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Laadi alla %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Otsene link"
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index cb8d06a22d..296f54efd9 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "%s jäädavalt kustutamine ebaõnnestus"
 msgid "Couldn't restore %s"
 msgstr "%s ei saa taastada"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Kustutatud failid"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Viga"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Kustutatud failid"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "taastatud"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Siin pole midagi. Sinu prügikast on tühi!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nimi"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Taasta"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Viga"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "taastatud"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Siin pole midagi. Sinu prügikast on tühi!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nimi"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Kustutatud"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Kustuta"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index e4b52db3a5..cb7846df73 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 06:20+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,16 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Sa kasutad serverit usalduseta asukohast"
 
-#: base.php:724
-msgid "Please contact your administrator"
-msgstr "Palun kontakteeru oma süsteemihalduriga"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
 
 #: private/app.php:236
 #, php-format
@@ -75,23 +78,23 @@ msgstr "Vigane pilt"
 msgid "web services under your control"
 msgstr "veebitenused sinu kontrolli all"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP-ina allalaadimine on välja lülitatud."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Failid tuleb alla laadida ükshaaval."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Tagasi failide juurde"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Valitud failid on ZIP-faili loomiseks liiga suured."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -277,19 +280,19 @@ msgstr "Määra admin kasutajanimi."
 msgid "Set an admin password."
 msgstr "Määra admini parool."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s jagas sinuga »%s«"
@@ -331,73 +334,79 @@ msgstr "%s jagamine ebaõnnestus, kuna gruppi %s pole olemas"
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "%s jagamine ebaõnnestus, kuna %s pole grupi %s liige"
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "%s jagamine ebaõnnestus, kuna linkidega jagamine pole lubatud"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Jagamise tüüp %s ei ole õige %s jaoks"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Lubade seadistus %s jaoks ebaõnnestus, kuna antud õigused ületavad %s jaoks määratud õigusi"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Lubade seadistus %s jaoks ebaõnnestus, kuna üksust ei leitud"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Jagamise tagarakend %s peab kasutusele võtma OCP\\Share_Backend liidese"
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Jagamise tagarakendit %s ei leitud"
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Jagamise tagarakendit %s jaoks ei leitud"
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "%s jagamine ebaõnnestus, kuna kasutaja %s on algne jagaja"
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "%s jagamine ebaõnnestus, kuna antud õigused ületavad %s jaoks määratud õigusi"
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "%s jagamine ebaõnnestus, kuna edasijagamine pole lubatud"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "%s jagamine ebaõnnestus, kuna jagamise tagarakend ei suutnud leida %s jaoks lähteallikat"
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr "%s jagamine ebaõnnestus, kuna faili ei suudetud leida failide puhvrist"
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Ei leia kategooriat \"%s\""
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 9eb8bed007..c146760788 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -49,15 +49,15 @@ msgstr "E-kiri on saadetud"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Pead seadistama oma e-postienne kui on võimalik saata test-kirju."
 
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Saatmise viis"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Krüpteerimine"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Autentimise meetod"
 
@@ -100,6 +100,16 @@ msgstr "Ei suutnud faile dekrüpteerida, palun kontrolli oma owncloud.log-i või
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Ei suutnud failde dekrüpteerida, kontrolli parooli ja proovi uuesti"
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Kiri on salvestatud"
@@ -116,6 +126,16 @@ msgstr "Grupi kustutamine ebaõnnestus"
 msgid "Unable to delete user"
 msgstr "Kasutaja kustutamine ebaõnnestus"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Keel on muudetud"
@@ -171,7 +191,7 @@ msgstr "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuen
 msgid "Unable to change password"
 msgstr "Ei suuda parooli muuta"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Saadan..."
 
@@ -227,34 +247,42 @@ msgstr "Uuenda"
 msgid "Updated"
 msgstr "Uuendatud"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Vali profiili pilt"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Väga nõrk parool"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Nõrk parool"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Enam-vähem sobiv parool"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Hea parool"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Väga hea parool"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "kustutatud"
@@ -300,7 +328,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Eesti"
 
@@ -488,148 +516,143 @@ msgstr "Luba rakendustel kasutada Share API-t"
 msgid "Allow links"
 msgstr "Luba lingid"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Luba avalikud üleslaadimised"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Luba edasijagamine"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Luba kasutajatel kõigiga jagada"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Luba teavitused e-postiga"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta"
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr "Aegu pärast"
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr "päeva"
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Peata jagamine N päeva möödudes"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Luba kasutajatel jagada kirjeid avalike linkidega"
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Luba edasijagamine"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Luba kasutajatel kõigiga jagada"
+
+#: templates/admin.php:263
+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:270
+msgid "Allow mail notification"
+msgstr "Luba teavitused e-postiga"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta"
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Turvalisus"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Sunni peale HTTPS-i kasutamine"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Sunnib kliente %s ühenduma krüpteeritult."
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "Postiserver"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Seda kasutatakse teadete välja saatmiseks."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Saatja aadress"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Autentimine on vajalik"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Serveri aadress"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Kasutajatunnused"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "SMTP kasutajatunnus"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "SMTP parool"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Testi e-posti seadeid"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Saada kiri"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Logi tase"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Rohkem"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Vähem"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versioon"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -782,29 +805,33 @@ msgstr "Keel"
 msgid "Help translate"
 msgstr "Aita tõlkida"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Sisselogimise parool"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Dekrüpteeri kõik failid"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Kasutajanimi"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 6756bba3fe..98890f42b6 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 12:31+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -128,25 +128,25 @@ msgstr "Oled kindel, et tahad kustutada praegust serveri seadistust?"
 msgid "Confirm Deletion"
 msgstr "Kinnita kustutamine"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s grupp leitud"
 msgstr[1] "%s gruppi leitud"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s kasutaja leitud"
 msgstr[1] "%s kasutajat leitud"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Vigane server"
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Ei suuda leida soovitud funktsioonaalsust"
 
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 118be3c55c..650d45adf2 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # asieriko <asieriko@gmail.com>, 2013
+# Hey_neken <mikel@olasagasti.info>, 2014
 # Piarres Beobide <pi@beobide.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -21,7 +22,7 @@ msgstr ""
 
 #: ajax/share.php:87
 msgid "Expiration date is in the past."
-msgstr ""
+msgstr "Muga data iraganekoa da"
 
 #: ajax/share.php:119 ajax/share.php:161
 #, php-format
@@ -60,229 +61,229 @@ msgstr "Ez dago behin-behineko profil irudirik, saiatu berriro"
 msgid "No crop data provided"
 msgstr "Ez da ebaketarako daturik zehaztu"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Igandea"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Astelehena"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Asteartea"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Asteazkena"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Osteguna"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Ostirala"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Larunbata"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Urtarrila"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Otsaila"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Martxoa"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Apirila"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Maiatza"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Ekaina"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Uztaila"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Abuztua"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Iraila"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Urria"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Azaroa"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Abendua"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Gordetzen..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "segundu"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "orain dela minutu %n"
 msgstr[1] "orain dela %n minutu"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "orain dela ordu %n"
 msgstr[1] "orain dela %n ordu"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "gaur"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "atzo"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "orain dela egun %n"
 msgstr[1] "orain dela %n egun"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "joan den hilabetean"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "orain dela hilabete %n"
 msgstr[1] "orain dela %n hilabete"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "joan den urtean"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "urte"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Aukeratu"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Bai"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Ez"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Aukeratu"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ados"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Errorea mezu txantiloia kargatzean: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "fitxategi {count}ek konfliktua sortu du"
 msgstr[1] "{count} fitxategik konfliktua sortu dute"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Fitxategi batek konfliktua sortu du"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Fitxategi Berriak"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
-msgstr ""
+msgstr "Dagoeneko existitzen diren fitxategiak"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Ze fitxategi mantendu nahi duzu?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Ezeztatu"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Jarraitu"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(denak hautatuta)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} hautatuta)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Errorea fitxategia existitzen da txantiloiak kargatzerakoan"
 
 #: js/setup.js:84
 msgid "Very weak password"
-msgstr ""
+msgstr "Pasahitz oso ahula"
 
 #: js/setup.js:85
 msgid "Weak password"
-msgstr ""
+msgstr "Pasahitz ahula"
 
 #: js/setup.js:86
 msgid "So-so password"
-msgstr ""
+msgstr "Halamoduzko pasahitza"
 
 #: js/setup.js:87
 msgid "Good password"
-msgstr ""
+msgstr "Pasahitz ona"
 
 #: js/setup.js:88
 msgid "Strong password"
-msgstr ""
+msgstr "Pasahitz sendoa"
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
@@ -292,12 +293,12 @@ msgstr "Elkarbanatuta"
 msgid "Share"
 msgstr "Elkarbanatu"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Errorea"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Errore bat egon da elkarbanatzean"
 
@@ -325,107 +326,116 @@ msgstr "Elkarbanatu erabiltzaile edo taldearekin..."
 msgid "Share link"
 msgstr "Elkarbanatu lotura"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Babestu pasahitzarekin"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Pasahitza"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Gaitu igotze publikoa"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Postaz bidali lotura "
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Bidali"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Ezarri muga data"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Muga data"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Elkarbanatu eposta bidez:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Ez da inor aurkitu"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "taldea"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Berriz elkarbanatzea ez dago baimendua"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "{user}ekin {item}-n elkarbanatuta"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "jakinarazi eposta bidez"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "editatu dezake"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "sarrera kontrola"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "sortu"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "eguneratu"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "ezabatu"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "elkarbanatu"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Pasahitzarekin babestuta"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Errorea izan da muga data kentzean"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Errore bat egon da muga data ezartzean"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Bidaltzen ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Eposta bidalia"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Abisua"
 
@@ -481,7 +491,7 @@ msgstr "%s pasahitza berrezarri"
 msgid ""
 "A problem has occurred whilst sending the email, please contact your "
 "administrator."
-msgstr ""
+msgstr "Arazo bat gertatu da posta elektronikoa bidaltzerakoan, mesedez jarri harremanetan zure administrariarekin."
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -549,7 +559,7 @@ msgstr ""
 #: setup/controller.php:144
 msgid ""
 "For the best results, please consider using a GNU/Linux server instead."
-msgstr ""
+msgstr "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea."
 
 #: strings.php:5
 msgid "Personal"
@@ -669,9 +679,13 @@ msgstr "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sortu <strong>kudeatzaile kontu<strong> bat"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Pasahitza"
+
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "Biltegia & datubasea"
 
 #: templates/installation.php:77
 msgid "Data folder"
@@ -772,7 +786,7 @@ msgstr "Beste erabiltzaile izenak"
 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 "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 6b0805ff7b..d855ae897e 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -29,27 +29,27 @@ msgstr "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da"
 msgid "Could not move %s"
 msgstr "Ezin dira fitxategiak mugitu %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Fitxategi izena ezin da hutsa izan."
 
 #: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "\"%s\" ez da fitxategi izen baliogarria."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "Jatorrizko karpeta mugitu edo ezabatu da."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -141,28 +141,32 @@ msgstr "Igoerak huts egin du. Ezin izan da fitxategiaren informazioa eskuratu."
 msgid "Invalid directory."
 msgstr "Baliogabeko karpeta."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Fitxategiak"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "Fitxategiaren tamainak {size1} igotzeko muga {size2} gainditzen du"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "Ez dago leku nahikorik, zu {size1} igotzen ari zara baina bakarrik {size2} libre dago"
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Igoera ezeztatuta"
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Ezin da zerbitzaritik emaitzik lortu"
 
@@ -175,134 +179,138 @@ msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.
 msgid "URL cannot be empty"
 msgstr "URLa ezin da hutsik egon"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} dagoeneko existitzen da"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Ezin izan da fitxategia sortu"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Ezin izan da karpeta sortu"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Errorea URLa eskuratzerakoan"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Elkarbanatu"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Ezabatu betirako"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Berrizendatu"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Errorea fitxategia mugitzean"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Errorea"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Zain"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Errorea fitxategia mugitzean."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Errorea fitxategia mugitzean"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Errorea"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Ezin izan da fitxategia berrizendatu"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Errorea fitxategia ezabatzerakoan."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Izena"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Tamaina"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Aldatuta"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "karpeta %n"
 msgstr[1] "%n karpeta"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "fitxategi %n"
 msgstr[1] "%n fitxategi"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} eta {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Fitxategi %n igotzen"
 msgstr[1] "%n fitxategi igotzen"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "\"{name}\" ez da fitxategi izen baliogarria."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi"
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Enkriptazio aplikaziorako gako pribatu okerra. Mesedez eguneratu zure gako pribatuaren pasahitza zure ezarpen pertsonaletan zure enkriptatuko fitxategietarako sarrera berreskuratzeko."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez  jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} eta {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Izena"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Tamaina"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Aldatuta"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s ezin da berrizendatu"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
-msgstr ""
+msgstr "Igo (max. %s)"
 
 #: templates/admin.php:4
 msgid "File handling"
@@ -336,68 +344,75 @@ msgstr "ZIP fitxategien gehienezko tamaina"
 msgid "Save"
 msgstr "Gorde"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Berria"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Testu fitxategi berria"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Testu fitxategia"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Karpeta berria"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Karpeta"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Estekatik"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Ezabatutako fitxategiak"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Ezeztatu igoera"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Ez dago ezer. Igo zerbait!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Igoera handiegia da"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Orain eskaneatzen ari da"
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index 5d1aca4683..a6c5023f24 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# asieriko <asieriko@gmail.com>, 2014
 # Piarres Beobide <pi@beobide.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -18,6 +19,166 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Bertakoa"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Kokapena"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Portua (hautazkoa)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Gaitu SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Hostalaria"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Erabiltzaile izena"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Pasahitza"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Partekatu"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Sarrera baimendua"
@@ -40,31 +201,31 @@ msgstr "Errore bat egon da Google Drive biltegiratzea konfiguratzean"
 
 #: js/settings.js:318 js/settings.js:325
 msgid "Saved"
-msgstr ""
+msgstr "Gordeta"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>Oharra:</b>"
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
-msgstr ""
+msgstr "eta"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -101,7 +262,7 @@ msgstr "Gehitu biltegiratzea"
 
 #: templates/settings.php:92
 msgid "No user or group"
-msgstr ""
+msgstr "Talde edo erabiltzailerik ez"
 
 #: templates/settings.php:95
 msgid "All Users"
@@ -126,7 +287,7 @@ msgstr "Gaitu erabiltzaileentzako Kanpo Biltegiratzea"
 
 #: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Baimendu erabiltzaileak hurrengo kanpo biltegiratzeak muntatzen"
 
 #: templates/settings.php:150
 msgid "SSL root certificates"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index 16b72ac14d..05d012c967 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# asieriko <asieriko@gmail.com>, 2013
+# asieriko <asieriko@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"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "{owner}-k partekatuta"
 
@@ -58,16 +58,15 @@ msgstr "elkarbanatzea ez dago gaituta"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Informazio gehiagorako, mesedez eskatu lotura hau bidali zuen pertsonari"
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "%sk partekatuta"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Deskargatu"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
-msgstr ""
+msgstr "Deskargatu %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Lotura zuzena"
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index 85c7136db7..4b2854710b 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Ezin izan da %s betirako ezabatu"
 msgid "Couldn't restore %s"
 msgstr "Ezin izan da %s berreskuratu"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Ezabatutako fitxategiak"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Errorea"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Ezabatutako Fitxategiak"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "Berrezarrita"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Ez dago ezer ez. Zure zakarrontzia hutsik dago!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Izena"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Berrezarri"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Errorea"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "Berrezarrita"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Ez dago ezer ez. Zure zakarrontzia hutsik dago!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Izena"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Ezabatuta"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Ezabatu"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index 2fb9d10a83..5c6ec17e58 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +19,15 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -75,23 +78,23 @@ msgstr "Baliogabeko irudia"
 msgid "web services under your control"
 msgstr "web zerbitzuak zure kontrolpean"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP deskarga ez dago gaituta."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Fitxategiak banan-banan deskargatu behar dira."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Itzuli fitxategietara"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -277,19 +280,19 @@ msgstr "Ezarri administraziorako erabiltzaile izena."
 msgid "Set an admin password."
 msgstr "Ezarri administraziorako pasahitza."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s-ek »%s« zurekin partekatu du"
@@ -331,73 +334,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Ezin da \"%s\" kategoria aurkitu"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 3cbf91c9ba..e3191926a2 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 
 #: admin/controller.php:73
 msgid "Saved"
-msgstr ""
+msgstr "Gordeta"
 
 #: admin/controller.php:90
 msgid "test email settings"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Enkriptazioa"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -101,6 +101,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Eposta gorde da"
@@ -117,6 +127,16 @@ msgstr "Ezin izan da taldea ezabatu"
 msgid "Unable to delete user"
 msgstr "Ezin izan da erabiltzailea ezabatu"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Hizkuntza aldatuta"
@@ -172,7 +192,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr "Ezin izan da pasahitza aldatu"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -228,32 +248,40 @@ msgstr "Eguneratu"
 msgid "Updated"
 msgstr "Eguneratuta"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Profil argazkia aukeratu"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
-msgstr ""
+msgstr "Pasahitz oso ahula"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
-msgstr ""
+msgstr "Pasahitz ahula"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
-msgstr ""
+msgstr "Halamoduzko pasahitza"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
-msgstr ""
+msgstr "Pasahitz ona"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
+msgstr "Pasahitz sendoa"
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
-#: js/personal.js:313
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
 msgstr ""
 
 #: js/users.js:47
@@ -301,7 +329,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Euskera"
 
@@ -489,148 +517,143 @@ msgstr "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko"
 msgid "Allow links"
 msgstr "Baimendu loturak"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Baimendu igoera publikoak"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Baimendu birpartekatzea"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Baimendu erabiltzaileak edonorekin elkarbanatzen"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Baimendu posta bidezko jakinarazpenak"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Baimendu birpartekatzea"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Baimendu erabiltzaileak edonorekin elkarbanatzen"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen"
+
 #: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
+msgstr "Baimendu posta bidezko jakinarazpenak"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Segurtasuna"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Behartu HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Zerbitzariaren helbidea"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Portua"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Kredentzialak"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Egunkaria"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Erregistro maila"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Gehiago"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Gutxiago"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Bertsioa"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -783,29 +806,33 @@ msgstr "Hizkuntza"
 msgid "Help translate"
 msgstr "Lagundu itzultzen"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Saioa hasteko pasahitza"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Desenkripattu fitxategi guztiak"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Sarrera Izena"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index ac81ab1cd5..bddedef503 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -87,65 +87,65 @@ msgstr "Arrakasta"
 msgid "Error"
 msgstr "Errorea"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfigurazioa ongi dago"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Konfigurazioa ez dago ongi"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Konfigurazioa osatu gabe dago"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Hautatu taldeak"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Hautatu objektu klaseak"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Hautatu atributuak"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Konexio froga ongi burutu da"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Konexio frogak huts egin du"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Baieztatu Ezabatzea"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "Talde %s aurkitu da"
 msgstr[1] "%s talde aurkitu dira"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "Erabiltzaile %s aurkitu da"
 msgstr[1] "%s erabiltzaile aurkitu dira"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Baliogabeko hostalaria"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Ezin izan da nahi zen ezaugarria aurkitu"
 
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index dff837b3f7..08cf06e825 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Ezeztatu"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
index 1f25874d0f..2b695dee6f 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr "Gorde"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/eu_ES/files_external.po b/l10n/eu_ES/files_external.po
index dbc51914a5..7c52a0f4a6 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "kokapena"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/eu_ES/files_sharing.po b/l10n/eu_ES/files_sharing.po
index 449e26af6b..df214550dd 100644
--- a/l10n/eu_ES/files_sharing.po
+++ b/l10n/eu_ES/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-04 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 06:12+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,7 +17,7 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Deskargatu"
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/eu_ES/files_trashbin.po b/l10n/eu_ES/files_trashbin.po
index 6705f5cbf2..28fb9197d3 100644
--- a/l10n/eu_ES/files_trashbin.po
+++ b/l10n/eu_ES/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Ezabatu"
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/eu_ES/lib.po b/l10n/eu_ES/lib.po
index 75ca48cd20..233b5af6b7 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index ce42674fd7..84e97ae511 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 3011d8ffd5..d7125b0487 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # miki_mika1362 <miki_mika1362@yahoo.com>, 2013
+# hajibaba <majid.hajibaba@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -45,11 +46,11 @@ 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"
@@ -59,202 +60,202 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "یکشنبه"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "دوشنبه"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "سه شنبه"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "چهارشنبه"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "پنجشنبه"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "جمعه"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "شنبه"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "ژانویه"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "فبریه"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "مارس"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "آوریل"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "می"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "ژوئن"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "جولای"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "آگوست"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "سپتامبر"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "اکتبر"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "نوامبر"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "دسامبر"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "در حال ذخیره سازی..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "ثانیه‌ها پیش"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n دقیقه قبل"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n ساعت قبل"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "امروز"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "دیروز"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n روز قبل"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "ماه قبل"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n ماه قبل"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "سال قبل"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "سال‌های قبل"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "انتخاب کردن"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "بله"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "نه"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "انتخاب کردن"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "قبول"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "فایل های جدید"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "منصرف شدن"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
-msgstr ""
+msgstr "ادامه"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -264,19 +265,19 @@ 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"
@@ -286,12 +287,12 @@ msgstr "اشتراک گذاشته شده"
 msgid "Share"
 msgstr "اشتراک‌گذاری"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "خطا"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "خطا درحال به اشتراک گذاشتن"
 
@@ -319,107 +320,116 @@ msgstr ""
 msgid "Share link"
 msgstr "اشتراک گذاشتن لینک"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "نگهداری کردن رمز عبور"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "گذرواژه"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "اجازه آپلود عمومی"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "پیوند ایمیل برای شخص."
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "ارسال"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "تنظیم تاریخ انقضا"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "تاریخ انقضا"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "از طریق ایمیل به اشتراک بگذارید :"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "کسی یافت نشد"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "گروه"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "اشتراک گذاری مجدد مجاز نمی باشد"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "به اشتراک گذاشته شده در {بخش} با {کاربر}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "لغو اشتراک"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "می توان ویرایش کرد"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "کنترل دسترسی"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "ایجاد"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "به روز"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "پاک کردن"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "به اشتراک گذاشتن"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "نگهداری از رمز عبور"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "خطا در تنظیم نکردن تاریخ انقضا "
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "خطا در تنظیم تاریخ انقضا"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "درحال ارسال ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "ایمیل ارسال شد"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "اخطار"
 
@@ -618,7 +628,7 @@ msgstr ""
 
 #: templates/altmail.php:7 templates/mail.php:20
 msgid "Cheers!"
-msgstr ""
+msgstr "سلامتی!"
 
 #: templates/installation.php:25 templates/installation.php:32
 #: templates/installation.php:39
@@ -663,9 +673,13 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "لطفا یک <strong> شناسه برای مدیر</strong> بسازید"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "گذرواژه"
+
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "انبارش و پایگاه داده"
 
 #: templates/installation.php:77
 msgid "Data folder"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 8200354f79..62d343b79a 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -29,7 +29,7 @@ msgstr "%s نمی توان جابجا کرد - در حال حاضر پرونده
 msgid "Could not move %s"
 msgstr "%s نمی تواند حرکت کند "
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "نام پرونده نمی تواند خالی باشد."
 
@@ -38,18 +38,18 @@ msgstr "نام پرونده نمی تواند خالی باشد."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "نام نامعتبر ،  '\\', '/', '<', '>', ':', '\"', '|', '?'  و '*'  مجاز نمی باشند."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -141,28 +141,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr "فهرست راهنما نامعتبر می باشد."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "پرونده‌ها"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "بار گذاری لغو شد"
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -175,128 +179,132 @@ msgstr "آپلودکردن پرونده در حال پیشرفت است. در ص
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{نام _جدید} در حال حاضر وجود دارد."
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "اشتراک‌گذاری"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "حذف قطعی"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "تغییرنام"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr ""
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد."
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "خطا"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "در انتظار"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "خطا"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "نام"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "اندازه"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "تاریخ"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "در حال بارگذاری %n فایل"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
-msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "نام"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "اندازه"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "تاریخ"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s نمیتواند تغییر نام دهد."
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -333,68 +341,75 @@ msgstr "حداکثرمقدار برای بار گزاری پرونده های ف
 msgid "Save"
 msgstr "ذخیره"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "جدید"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "فایل متنی"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "پوشه جدید"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "پوشه"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "از پیوند"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "فایل های حذف شده"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "متوقف کردن بار گذاری"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "اینجا هیچ چیز نیست."
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "دانلود"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "حذف"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "بازرسی کنونی"
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index d649081bcf..c2cd030217 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # miki_mika1362 <miki_mika1362@yahoo.com>, 2013
+# hajibaba <majid.hajibaba@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-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 14:01+0000\n"
+"Last-Translator: hajibaba <majid.hajibaba@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -94,7 +95,7 @@ msgstr ""
 
 #: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "کاربران زیر برای رمزنگاری تنظیم نشده اند"
 
 #: js/detect-migration.js:21
 msgid "Initial encryption started... This can take some time. Please wait."
@@ -112,91 +113,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/fa/files_external.po b/l10n/fa/files_external.po
index f5d47a1067..0eb8480154 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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,6 +18,166 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "محل"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "میزبانی"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "نام کاربری"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "گذرواژه"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "اشتراک‌گذاری"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "آدرس"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "مجوز دسترسی صادر شد"
@@ -42,29 +202,29 @@ msgstr "خطا به هنگام تنظیم فضای Google Drive"
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 192617a545..a52346ce13 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # miki_mika1362 <miki_mika1362@yahoo.com>, 2013
+# hajibaba <majid.hajibaba@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:20+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 14:08+0000\n"
+"Last-Translator: hajibaba <majid.hajibaba@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,13 +19,13 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "اشتراک گذارنده {owner}"
 
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
-msgstr ""
+msgstr "این اشتراک توسط رمز عبور محافظت می شود"
 
 #: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
@@ -36,38 +37,37 @@ 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
-msgid "shared by %s"
-msgstr ""
+#: templates/public.php:21
+msgid "Download"
+msgstr "دانلود"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
-msgstr ""
+msgstr "دانلود %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
-msgstr ""
+msgstr "پیوند مستقیم"
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index a5308fdb1b..6f07b26556 100644
--- a/l10n/fa/files_trashbin.po
+++ b/l10n/fa/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr "%s را نمی توان برای همیشه حذف کرد"
 msgid "Couldn't restore %s"
 msgstr "%s را نمی توان بازگرداند"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "نام"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "بازیابی"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "خطا"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "هیچ چیزی اینجا نیست. سطل زباله ی شما خالی است."
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "نام"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "حذف شده"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "حذف"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index bb866264d5..485c30baf5 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +18,15 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -64,33 +67,33 @@ msgstr ""
 
 #: 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:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "دانلود به صورت فشرده غیر فعال است"
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "فایل ها باید به صورت یکی یکی دانلود شوند"
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "بازگشت به فایل ها"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "فایل های انتخاب شده بزرگتر از آن هستند که بتوان یک فایل فشرده تولید کرد"
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -276,19 +279,19 @@ msgstr "یک نام کاربری برای مدیر تنظیم نمایید."
 msgid "Set an admin password."
 msgstr "یک رمزعبور برای مدیر تنظیم نمایید."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید."
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s به اشتراک گذاشته شده است »%s« توسط شما"
@@ -330,73 +333,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "دسته بندی %s یافت نشد"
@@ -408,12 +417,12 @@ msgstr "ثانیه‌ها پیش"
 #: private/template/functions.php:135
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n دقیقه قبل"
 
 #: private/template/functions.php:136
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n ساعت قبل"
 
 #: private/template/functions.php:137
 msgid "today"
@@ -426,7 +435,7 @@ msgstr "دیروز"
 #: private/template/functions.php:140
 msgid "%n day go"
 msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n روز قبل"
 
 #: private/template/functions.php:142
 msgid "last month"
@@ -435,7 +444,7 @@ msgstr "ماه قبل"
 #: private/template/functions.php:143
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n ماه قبل"
 
 #: private/template/functions.php:145
 msgid "last year"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 33cb1f38c1..4b180f7634 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "رمزگذاری"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -101,6 +101,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "ایمیل ذخیره شد"
@@ -117,6 +127,16 @@ msgstr "حذف گروه امکان پذیر نیست"
 msgid "Unable to delete user"
 msgstr "حذف کاربر امکان پذیر نیست"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "زبان تغییر کرد"
@@ -172,7 +192,7 @@ msgstr "سیستم مدیریتی امکان تغییر رمز را پشتیبا
 msgid "Unable to change password"
 msgstr "نمی‌توان رمز را تغییر داد"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -228,34 +248,42 @@ msgstr "به روز رسانی"
 msgid "Updated"
 msgstr "بروز رسانی انجام شد"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "انتخاب تصویر پروفایل"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
-msgstr ""
+msgstr "رمز عبور ضعیف"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
-msgstr ""
+msgstr "رمز عبور متوسط"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
-msgstr ""
+msgstr "رمز عبور خوب"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
-msgstr ""
+msgstr "رمز عبور قوی"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "حذف شده"
@@ -301,7 +329,7 @@ msgstr "رمز عبور صحیح باید وارد شود"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "اخطار: پوشه‌ی خانه برای کاربر \"{user}\" در حال حاضر وجود دارد"
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -489,148 +517,143 @@ msgstr "اجازه ی برنامه ها برای استفاده از API اشت
 msgid "Allow links"
 msgstr "اجازه ی لینک ها"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها"
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "مجوز اشتراک گذاری مجدد"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "اجازه به کاربران برای اشتراک گذاری دوباره با آنها"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "اجازه به کابران برای اشتراک گذاری با همه"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "اجازه به کاربران برای اشتراک گذاری ، تنها با دیگر کابران گروه خودشان"
+
 #: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
+msgstr "مجاز نمودن اطلاع رسانی توسط ایمیل"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "امنیت"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "وادار کردن HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "کلاینت‌ها را مجبور کن که از یک ارتباط رمزنگاری شده برای اتصال به %s استفاده کنند."
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "برای فعال سازی یا عدم فعال سازی اجبار استفاده از SSL، لطفاً از طریق HTTPS به %s وصل شوید."
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "آدرس سرور"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "درگاه"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "اعتبارهای"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "کارنامه"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "سطح ورود"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "بیش‌تر"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "کم‌تر"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "نسخه"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -783,29 +806,33 @@ msgstr "زبان"
 msgid "Help translate"
 msgstr "به ترجمه آن کمک کنید"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "رمز ورود"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "تمام فایلها رمزگشایی شود"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "نام کاربری"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 7244996650..16c68e0e0e 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -87,63 +87,63 @@ msgstr "موفقیت"
 msgid "Error"
 msgstr "خطا"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "تست اتصال با موفقیت انجام گردید"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "تست اتصال ناموفق بود"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "تایید حذف"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -284,7 +284,7 @@ msgstr "بازگشت"
 
 #: templates/part.wizardcontrols.php:8
 msgid "Continue"
-msgstr ""
+msgstr "ادامه"
 
 #: templates/settings.php:11
 msgid ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 8536577419..b7b119f9c3 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 19:41+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,207 +61,207 @@ msgstr "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen"
 msgid "No crop data provided"
 msgstr "Puutteellinen tieto"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "sunnuntai"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "maanantai"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "tiistai"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "keskiviikko"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "torstai"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "perjantai"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "lauantai"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "tammikuu"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "helmikuu"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "maaliskuu"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "huhtikuu"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "toukokuu"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "kesäkuu"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "heinäkuu"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "elokuu"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "syyskuu"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "lokakuu"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "marraskuu"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "joulukuu"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Tallennetaan..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "sekuntia sitten"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minuutti sitten"
 msgstr[1] "%n minuuttia sitten"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n tunti sitten"
 msgstr[1] "%n tuntia sitten"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "tänään"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "eilen"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n päivä sitten"
 msgstr[1] "%n päivää sitten"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "viime kuussa"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n kuukausi sitten"
 msgstr[1] "%n kuukautta sitten"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "viime vuonna"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "vuotta sitten"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Valitse"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Virhe ladatessa tiedostopohjia: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Kyllä"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Ei"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Valitse"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Virhe ladatessa tiedostopohjia: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Virhe ladatessa viestipohjaa: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} tiedoston ristiriita"
 msgstr[1] "{count} tiedoston ristiriita"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Yhden tiedoston ristiriita"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Uudet tiedostot"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Jo olemassa olevat tiedostot"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Mitkä tiedostot haluat säilyttää?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Peru"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Jatka"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(kaikki valittu)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} valittu)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Virhe ladatessa mallipohjaa"
 
@@ -293,12 +293,12 @@ msgstr "Jaettu"
 msgid "Share"
 msgstr "Jaa"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Virhe"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Virhe jaettaessa"
 
@@ -326,107 +326,116 @@ msgstr "Jaa käyttäjän tai ryhmän kanssa…"
 msgid "Share link"
 msgstr "Jaa linkki"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta"
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr "Oletuksena julkinen linkki vanhenee {days} päivässä"
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Suojaa salasanalla"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Salasana"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr "Valitse salasana julkiselle linkille"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Salli julkinen lähetys"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Lähetä linkki sähköpostitse"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Lähetä"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Aseta päättymispäivä"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Päättymispäivä"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Jaa sähköpostilla:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Henkilöitä ei löytynyt"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "ryhmä"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Jakaminen uudelleen ei ole salittu"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "{item} on jaettu {user} kanssa"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Peru jakaminen"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "ilmoita sähköpostitse"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "voi muokata"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "Pääsyn hallinta"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "luo"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "päivitä"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "poista"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "jaa"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Salasanasuojattu"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Virhe purettaessa eräpäivää"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Virhe päättymispäivää asettaessa"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Lähetetään..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Sähköposti lähetetty"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Varoitus"
 
@@ -670,6 +679,10 @@ msgstr "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a
 msgid "Create an <strong>admin account</strong>"
 msgstr "Luo <strong>ylläpitäjän tunnus</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Salasana"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Tallennus ja tietokanta"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 277ab93a71..934d6d27d6 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 19:41+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +31,7 @@ msgstr "Kohteen %s siirto ei onnistunut - Tiedosto samalla nimellä on jo olemas
 msgid "Could not move %s"
 msgstr "Kohteen %s siirto ei onnistunut"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Tiedoston nimi ei voi olla tyhjä."
 
@@ -40,18 +40,18 @@ msgstr "Tiedoston nimi ei voi olla tyhjä."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" on virheellinen tiedostonimi."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Kohdekansio on siirretty tai poistettu."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -143,28 +143,32 @@ msgstr "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty."
 msgid "Invalid directory."
 msgstr "Virheellinen kansio."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Tiedostot"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Kaikki tiedostot"
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Yhteiskoko {size1} ylittää lähetysrajan {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 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:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Lähetys peruttu."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Tuloksien saaminen palvelimelta ei onnistunut."
 
@@ -177,131 +181,135 @@ msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedos
 msgid "URL cannot be empty"
 msgstr "Osoite ei voi olla tyhjä"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} on jo olemassa"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Tiedoston luominen epäonnistui"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Kansion luominen epäonnistui"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Virhe noutaessa verkko-osoitetta"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Jaa"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Poista pysyvästi"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Virhe tiedostoa siirrettäessä"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Virhe"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Odottaa"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Virhe tiedostoa siirrettäessä."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Virhe tiedostoa siirrettäessä"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Virhe"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Tiedoston nimeäminen uudelleen epäonnistui"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Virhe tiedostoa poistaessa."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nimi"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Koko"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Muokattu"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n kansio"
 msgstr[1] "%n kansiota"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n tiedosto"
 msgstr[1] "%n tiedostoa"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} ja {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Lähetetään %n tiedosto"
 msgstr[1] "Lähetetään %n tiedostoa"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" on virheellinen tiedostonimi."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Tallennustila on melkein loppu ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen."
 
-#: js/files.js:136
+#: js/files.js:144
 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 "Salaussovelluksen salausavain on virheellinen. Ole hyvä ja päivitä salausavain henkilökohtaisissa asetuksissasi jotta voit taas avata salatuskirjoitetut tiedostosi."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Salaus poistettiin käytöstä, mutta tiedostosi ovat edelleen salattuina. Siirry henkilökohtaisiin asetuksiin avataksesi tiedostojesi salauksen."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} ja {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nimi"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Koko"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Muokattu"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "kohteen %s nimeäminen uudelleen epäonnistui"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Lähetys (enintään %s)"
@@ -338,68 +346,75 @@ msgstr "ZIP-tiedostojen enimmäiskoko"
 msgid "Save"
 msgstr "Tallenna"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Uusi"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Uusi tekstitiedosto"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Tekstitiedosto"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Uusi kansio"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Kansio"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Linkistä"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Poistetut tiedostot"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Peru lähetys"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Poista"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Lähetettävä tiedosto on liian suuri"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Tiedostoja tarkistetaan, odota hetki."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Tämänhetkinen tutkinta"
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index 2ed2462b96..67f1b9fe77 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-04-10 01:54-0400\n"
-"PO-Revision-Date: 2014-04-09 12:30+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:21+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,166 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Paikallinen"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Sijainti"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Portti (valinnainen)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Alue (valinnainen)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Käytä SSL:ää"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Isäntä"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Käyttäjätunnus"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Salasana"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Käyttäjätunnus (vaaditaan)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Jaa"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "Verkko-osoite"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "Salattu https://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Pääsy sallittu"
@@ -42,29 +202,29 @@ msgstr "Virhe Google Drive levyn asetuksia tehtäessä"
 msgid "Saved"
 msgstr "Tallennettu"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Huomio:</b> "
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr "ja"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 "<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:626
+#: lib/config.php:623
 #, 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 "<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:628
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index 8304b934d1..80a6e8f4a2 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Jakanut {owner}"
 
@@ -58,16 +58,15 @@ msgstr "jakaminen on poistettu käytöstä"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Kysy lisätietoja henkilöltä, jolta sait linkin."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "jakanut %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Lataa"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Lataa %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Suora linkki"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index acc0233212..cbb0cb8f8e 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Kohdetta %s ei voitu poistaa pysyvästi"
 msgid "Couldn't restore %s"
 msgstr "Kohteen %s palautus epäonnistui"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Poistetut tiedostot"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Virhe"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Poistetut tiedostot"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "palautettu"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Tyhjää täynnä! Roskakorissa ei ole mitään."
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nimi"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Palauta"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Virhe"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "palautettu"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Tyhjää täynnä! Roskakorissa ei ole mitään."
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nimi"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Poista"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 4472709ca4..8e10598626 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -18,12 +18,15 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -74,23 +77,23 @@ msgstr "Virheellinen kuva"
 msgid "web services under your control"
 msgstr "verkkopalvelut hallinnassasi"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP-lataus on poistettu käytöstä."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Tiedostot on ladattava yksittäin."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Takaisin tiedostoihin"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -276,19 +279,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:202
+#: private/setup.php:164
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Web-palvelimen asetukset eivät ole kelvolliset tiedostojen synkronointia varten, koska WebDAV-liitäntä vaikuttaa olevan rikki."
 
-#: private/setup.php:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s jakoi kohteen »%s« kanssasi"
@@ -296,7 +299,7 @@ msgstr "%s jakoi kohteen »%s« kanssasi"
 #: private/share/share.php:498
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
+msgstr "Kohteen %s jakaminen epäonnistui, koska tiedostoa ei ole olemassa"
 
 #: private/share/share.php:523
 #, php-format
@@ -330,73 +333,79 @@ msgstr "Kohteen %s jakaminen epäonnistui, koska ryhmää %s ei ole olemassa"
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s ei ole ryhmän %s jäsen"
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Kohteen %s jakaminen epäonnistui, koska jakaminen linkkejä käyttäen ei ole sallittu"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Kohteen %s oikeuksien asettaminen epäonnistui, koska kohdetta ei löytynyt"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s on alkuperäinen jakaja"
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Kohteen %s jakaminen epäonnistui, koska jakaminen uudelleen ei ole sallittu"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr "Kohteen %s jakaminen epäonnistui, koska tiedostoa ei löytynyt tiedostovälimuistista"
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Luokkaa \"%s\" ei löytynyt"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index cdf1b1ee44..d9bd2aeaa5 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Lähetystila"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Salaus"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Tunnistautumistapa"
 
@@ -99,6 +99,16 @@ msgstr "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tie
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen"
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Salausavaimet poistettiin pysyvästi"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Sähköposti tallennettu"
@@ -115,6 +125,16 @@ msgstr "Ryhmän poisto epäonnistui"
 msgid "Unable to delete user"
 msgstr "Käyttäjän poisto epäonnistui"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Varmuuskopiot palautettiin onnistuneesti"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Kieli on vaihdettu"
@@ -170,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr "Salasanan vaihto ei onnistunut"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Lähetetään..."
 
@@ -226,34 +246,42 @@ msgstr "Päivitä"
 msgid "Updated"
 msgstr "Päivitetty"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Valitse profiilikuva"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Erittäin heikko salasana"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Heikko salasana"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Kohtalainen salasana"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Hyvä salasana"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Vahva salasana"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Poista salausavaimet pysyvästi."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Palauta salausavaimet."
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "poistettu"
@@ -299,7 +327,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "_kielen_nimi_"
 
@@ -487,148 +515,143 @@ msgstr "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa"
 msgid "Allow links"
 msgstr "Salli linkit"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Salli julkiset lähetykset"
 
-#: 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 "Salli uudelleenjakaminen"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Salli käyttäjien jakaa kenen tahansa kanssa"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Salli sähköposti-ilmoitukset"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Salli käyttäjien lähettää sähköposti-ilmoituksia jaetuista tiedostoista"
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
-msgstr ""
+msgstr "Aseta oletusvanhenemispäivä"
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr "Vanhenna"
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr "päivän jälkeen"
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
-msgstr ""
+msgstr "Pakota vanhenemispäivä"
+
+#: templates/admin.php:242
+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:252
+msgid "Allow resharing"
+msgstr "Salli uudelleenjakaminen"
+
+#: templates/admin.php:253
+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:260
+msgid "Allow users to share with anyone"
+msgstr "Salli käyttäjien jakaa kenen tahansa kanssa"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
-msgstr "Vanhenna jaot oletuksena N päivän jälkeen"
+msgid "Allow mail notification"
+msgstr "Salli sähköposti-ilmoitukset"
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr "Salli käyttäjien lähettää sähköposti-ilmoituksia jaetuista tiedostoista"
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Tietoturva"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Pakota HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
-msgstr ""
+msgstr "Yhdistä %siin HTTPS-yhteydellä ottaaksesi käyttöön tai poistaaksesi käytöstä SSL-pakotteen."
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "Sähköpostipalvelin"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Tätä käytetään ilmoitusten lähettämiseen."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Lähettäjän osoite"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Tunnistautuminen vaaditaan"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Palvelimen osoite"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Portti"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Tilitiedot"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "SMTP-käyttäjätunnus"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "SMTP-salasana"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Testaa sähköpostiasetukset"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Lähetä sähköpostiviesti"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Loki"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Lokitaso"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Enemmän"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Vähemmän"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versio"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +804,33 @@ msgstr "Kieli"
 msgid "Help translate"
 msgstr "Auta kääntämisessä"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Kirjautumissalasana"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Pura kaikkien tiedostojen salaus"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Palauta salausavaimet"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Poista salausavaimet"
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Kirjautumisnimi"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 099986464f..3ab853ccde 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -86,65 +86,65 @@ msgstr "Onnistui!"
 msgid "Error"
 msgstr "Virhe"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Valitse ryhmät"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Yhteystesti onnistui"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Yhteystesti epäonnistui"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Vahvista poisto"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index bf908d51b7..3b6340a885 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -66,207 +66,207 @@ msgstr "Aucune image temporaire disponible pour le profil. Essayez à nouveau."
 msgid "No crop data provided"
 msgstr "Aucune donnée de culture fournie"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Lundi"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Vendredi"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Samedi"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "janvier"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "février"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "mars"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "avril"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "mai"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "juin"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "juillet"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "août"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "septembre"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "octobre"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "novembre"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "décembre"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Enregistrement..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "il y a quelques secondes"
 
-#: js/js.js:1247
+#: js/js.js:1241
 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:1248
+#: js/js.js:1242
 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:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "aujourd'hui"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "hier"
 
-#: js/js.js:1251
+#: js/js.js:1245
 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:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "le mois dernier"
 
-#: js/js.js:1253
+#: js/js.js:1247
 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:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "l'année dernière"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "il y a plusieurs années"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Choisir"
-
-#: 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:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Oui"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Non"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Choisir"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Erreur de chargement du modèle de sélectionneur de fichiers : {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Erreur de chargement du modèle de message : {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 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:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Un conflit de fichier"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Nouveaux fichiers"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Fichiers déjà existants"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Quels fichiers désirez-vous garder ?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Annuler"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Poursuivre"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(tous sélectionnés)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} sélectionnés)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Erreur de chargement du modèle de fichier existant"
 
@@ -298,12 +298,12 @@ msgstr "Partagé"
 msgid "Share"
 msgstr "Partager"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Erreur"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Erreur lors de la mise en partage"
 
@@ -331,107 +331,116 @@ msgstr "Partager avec un utilisateur ou un groupe..."
 msgid "Share link"
 msgstr "Partager le lien"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Protéger par un mot de passe"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Mot de passe"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Autoriser l'upload par les utilisateurs non enregistrés"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Envoyez le lien par email"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Envoyer"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Spécifier la date d'expiration"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Date d'expiration"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Partager via e-mail :"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Aucun utilisateur trouvé"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "groupe"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Le repartage n'est pas autorisé"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Partagé dans {item} avec {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "Notifier par email"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "édition autorisée"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "contrôle des accès"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "créer"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "mettre à jour"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "supprimer"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "partager"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Protégé par un mot de passe"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Erreur lors de la spécification de la date d'expiration"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "En cours d'envoi ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Email envoyé"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Attention"
 
@@ -675,6 +684,10 @@ msgstr "Pour les informations de configuration de votre serveur, veuillez lire l
 msgid "Create an <strong>admin account</strong>"
 msgstr "Créer un <strong>compte administrateur</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Mot de passe"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Support de stockage & base de données"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 35d91bcfc6..2a426dda56 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -6,14 +6,15 @@
 # Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
 # Christophe Lherieau <skimpax@gmail.com>, 2013-2014
 # etiess <etiess@gmail.com>, 2013
+# ptit_boogy <ptit.boogy@gmail.com>, 2014
 # MathieuP, 2013
 # ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -32,7 +33,7 @@ msgstr "Impossible de déplacer %s - Un fichier possédant ce nom existe déjà"
 msgid "Could not move %s"
 msgstr "Impossible de déplacer %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Le nom de fichier ne peut être vide."
 
@@ -41,18 +42,18 @@ msgstr "Le nom de fichier ne peut être vide."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" n'est pas un nom de fichier valide."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Le dossier cible a été déplacé ou supprimé."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -144,28 +145,32 @@ msgstr "L'envoi a échoué. Impossible d'obtenir les informations du fichier."
 msgid "Invalid directory."
 msgstr "Dossier invalide."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Fichiers"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 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:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Envoi annulé."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Ne peut recevoir les résultats du serveur."
 
@@ -178,131 +183,135 @@ msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera
 msgid "URL cannot be empty"
 msgstr "L'URL ne peut pas être vide"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} existe déjà"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Impossible de créer le fichier"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Impossible de créer le dossier"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Erreur d'accès à l'URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Partager"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Supprimer de façon définitive"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Renommer"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Erreur lors du déplacement du fichier"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Erreur"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "En attente"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Erreur lors du déplacement du fichier."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Erreur lors du déplacement du fichier"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Erreur"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Impossible de renommer le fichier"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Erreur pendant la suppression du fichier."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nom"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Taille"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Modifié"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dossier"
 msgstr[1] "%n dossiers"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fichier"
 msgstr[1] "%n fichiers"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} et {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Téléversement de %n fichier"
 msgstr[1] "Téléversement de %n fichiers"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" n'est pas un nom de fichier valide."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "L'application de chiffrement est activée mais vos clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter."
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Votre clef privée pour l'application de chiffrement est invalide ! Veuillez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} et {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nom"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Taille"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Modifié"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s ne peut être renommé"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Envoi (max. %s)"
@@ -339,68 +348,75 @@ msgstr "Taille maximale pour les fichiers ZIP"
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Nouveau"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Nouveau fichier texte"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Fichier texte"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Dossier"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Depuis le lien"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Fichiers supprimés"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Annuler l'envoi"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Supprimer"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Téléversement trop volumineux"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Analyse en cours"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index a7cb616441..9009ad7b72 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -3,15 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ReDiX <froment.a@gmail.com>, 2014
 # timelord <bruno@timelord.fr>, 2014
 # Christophe Lherieau <skimpax@gmail.com>, 2014
+# ptit_boogy <ptit.boogy@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\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"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -19,6 +21,166 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Local"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Emplacement"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Clé"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Secret"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "Clé d'accès"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Clé secrète"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "Nom machine (optionnel)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Port (optionnel)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Activer SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "Clé App"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Hôte"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Mot de passe"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Root"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "ID Client"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Nom d'utilisation (requis)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr "Clé API (requis pour Rackspace Cloud Files)"
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr "Mot de passe (requis pour OpenStack Object Storage)"
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Partager"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Accès autorisé"
@@ -43,29 +205,29 @@ msgstr "Erreur lors de la configuration du support de stockage Google Drive"
 msgid "Saved"
 msgstr "Sauvegarder"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Attention :</b>"
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr "et"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 "<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:626
+#: lib/config.php:623
 #, 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 "<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:628
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index c7044e066f..f1f702ad5e 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/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-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 19:40+0000\n"
-"Last-Translator: etiess <etiess@gmail.com>\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -21,7 +21,7 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Partagé par {owner}"
 
@@ -61,16 +61,15 @@ msgstr "le partage est désactivé"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "partagé par %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Télécharger"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Télécharger %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Lien direct"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index 310713d5dd..3671ca8060 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Impossible d'effacer %s de façon permanente"
 msgid "Couldn't restore %s"
 msgstr "Impossible de restaurer %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Fichiers supprimés"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Erreur"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Fichiers effacés"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "restauré"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Il n'y a rien ici. Votre corbeille est vide !"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nom"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Restaurer"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Erreur"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "restauré"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Il n'y a rien ici. Votre corbeille est vide !"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nom"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Effacé"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Supprimer"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index aaf7e38f7f..5afa3b8b89 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 07:00+0000\n"
-"Last-Translator: ptit_boogy <ptit.boogy@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,13 +22,16 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Vous accédez au serveur à partir d'un domaine non-approuvé."
 
-#: base.php:724
-msgid "Please contact your administrator"
-msgstr "Veuillez contacter votre administrateur"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
 
 #: private/app.php:236
 #, php-format
@@ -78,23 +81,23 @@ msgstr "Image invalide"
 msgid "web services under your control"
 msgstr "services web sous votre contrôle"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Téléchargement ZIP désactivé."
 
-#: private/files.php:233
+#: private/files.php:236
 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:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Retour aux Fichiers"
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -280,19 +283,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:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s partagé »%s« avec vous"
@@ -334,73 +337,79 @@ msgstr "Le partage de %s a échoué car le groupe %s n'existe pas"
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Le partage de %s a échoué car %s n'est pas membre du groupe %s"
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Le partage de %s a échoué car un partage de lien n'est pas permis"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Le type de partage %s n'est pas valide pour %s"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Le réglage des permissions pour %s a échoué car les permissions dépassent celle accordée à %s"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Le réglage des permissions pour %s a échoué car l'objet n'a pas été trouvé"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Le partage de %s a échoué car l'utilisateur %s est déjà l'utilisateur à l'origine du partage."
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Le partage de %s a échoué car les permissions dépassent les permissions accordées à %s"
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Le partage de %s a échoué car le repartage n'est pas autorisé"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr "Le partage de %s a échoué car le fichier n'a pas été trouvé dans les fichiers mis en cache."
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Impossible de trouver la catégorie \"%s\""
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index d07eec044e..84072a8334 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -59,15 +59,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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Mode d'envoi"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Méthode d'authentification"
 
@@ -110,6 +110,16 @@ msgstr "Impossible de décrypter vos fichiers, veuillez vérifier votre owncloud
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau"
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "E-mail sauvegardé"
@@ -126,6 +136,16 @@ msgstr "Impossible de supprimer le groupe"
 msgid "Unable to delete user"
 msgstr "Impossible de supprimer l'utilisateur"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Langue changée"
@@ -181,7 +201,7 @@ msgstr "L'infrastructure d'arrière-plan ne supporte pas la modification de mot
 msgid "Unable to change password"
 msgstr "Impossible de modifier le mot de passe"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Envoi en cours..."
 
@@ -237,34 +257,42 @@ msgstr "Mettre à jour"
 msgid "Updated"
 msgstr "Mise à jour effectuée avec succès"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Selectionner une photo de profil "
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Mot de passe de très faible sécurité"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Mot de passe de faible sécurité"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Mot de passe de sécurité tout juste acceptable"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Mot de passe de sécurité suffisante"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Mot de passe de forte sécurité"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Déchiffrement en cours... Cela peut prendre un certain temps."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "supprimé"
@@ -310,7 +338,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Français"
 
@@ -498,148 +526,143 @@ msgstr "Autoriser les applications à utiliser l'API de partage"
 msgid "Allow links"
 msgstr "Autoriser les liens"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Autoriser les téléversements publics"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Autoriser le repartage"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Autoriser les utilisateurs à partager avec tout le monde"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Autoriser les notifications par couriel"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Autoriser les utilisateurs à envoyer une notification par courriel concernant les fichiers partagés"
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
-msgstr ""
+msgstr "Spécifier la date d'expiration par défaut"
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr "Expire après"
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr "jours"
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
-msgstr ""
+msgstr "Impose la date d'expiration"
+
+#: templates/admin.php:242
+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:252
+msgid "Allow resharing"
+msgstr "Autoriser le repartage"
+
+#: templates/admin.php:253
+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:260
+msgid "Allow users to share with anyone"
+msgstr "Autoriser les utilisateurs à partager avec tout le monde"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
-msgstr "Par défaut, les partages expireront après N jours"
+msgid "Allow mail notification"
+msgstr "Autoriser les notifications par couriel"
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr "Autoriser les utilisateurs à envoyer une notification par courriel concernant les fichiers partagés"
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Sécurité"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Forcer HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "Serveur mail"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Ceci est utilisé pour l'envoi des notifications."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Adresse source"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Authentification requise"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Adresse du serveur"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Informations d'identification"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "Nom d'utilisateur SMTP"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "Mot de passe SMTP"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Paramètres de test d'e-mail"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Envoyer un e-mail"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Niveau de log"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Plus"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Moins"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -792,29 +815,33 @@ msgstr "Langue"
 msgid "Help translate"
 msgstr "Aidez à traduire"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Mot de passe de connexion"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Déchiffrer tous les fichiers"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Nom d'utilisateur"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 063d69cc22..13c74e26d9 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
 "Last-Translator: RyDroid <rydroid_trans@yahoo.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -90,65 +90,65 @@ msgstr "Succès"
 msgid "Error"
 msgstr "Erreur"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuration OK"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Configuration incorrecte"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Configuration incomplète"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Sélectionnez les groupes"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Sélectionner les classes d'objet"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Sélectionner les attributs"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Test de connexion réussi"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Test de connexion échoué"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Confirmer la suppression"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s groupe trouvé"
 msgstr[1] "%s groupes trouvés"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s utilisateur trouvé"
 msgstr[1] "%s utilisateurs trouvés"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Hôte invalide"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Impossible de trouver la fonction souhaitée"
 
diff --git a/l10n/fr_CA/core.po b/l10n/fr_CA/core.po
index 53de5d6a0d..a71cdd3756 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/fr_CA/files.po b/l10n/fr_CA/files.po
index 03c3942d27..f2a9460497 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/fr_CA/files_external.po b/l10n/fr_CA/files_external.po
index 04acd06d67..f9cb77ad2f 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/fr_CA/files_sharing.po b/l10n/fr_CA/files_sharing.po
index 4aea61c17c..91851282b9 100644
--- a/l10n/fr_CA/files_sharing.po
+++ b/l10n/fr_CA/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/fr_CA/files_trashbin.po b/l10n/fr_CA/files_trashbin.po
index 79e8ab337e..389e4d3cb3 100644
--- a/l10n/fr_CA/files_trashbin.po
+++ b/l10n/fr_CA/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/fr_CA/lib.po b/l10n/fr_CA/lib.po
index 65455a870c..01f4443820 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/fr_CA/settings.po b/l10n/fr_CA/settings.po
index 951ff58a54..480f5a40ee 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 4485652ceb..323e200c9e 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,207 +60,207 @@ msgstr "Non hai unha imaxe temporal de perfil dispoñíbel, volva tentalo"
 msgid "No crop data provided"
 msgstr "Non indicou como recortar"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "domingo"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "luns"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "martes"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "mércores"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "xoves"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "venres"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "sábado"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "xaneiro"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "febreiro"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "marzo"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "abril"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "maio"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "xuño"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "xullo"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "agosto"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "setembro"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "outubro"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "novembro"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "decembro"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Axustes"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Gardando..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "hai %n minuto"
 msgstr[1] "hai %n minutos"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "hai %n hora"
 msgstr[1] "hai %n horas"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "hoxe"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "onte"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "hai %n día"
 msgstr[1] "vai %n días"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "último mes"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "hai %n mes"
 msgstr[1] "hai %n meses"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "último ano"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "anos atrás"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Escoller"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Produciuse un erro ao cargar o modelo do selector: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Si"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Non"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Escoller"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Produciuse un erro ao cargar o modelo do selector: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Aceptar"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Produciuse un erro ao cargar o modelo da mensaxe: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} conflito de ficheiro"
 msgstr[1] "{count} conflitos de ficheiros"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Un conflito de ficheiro"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Ficheiros novos"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Ficheiros xa existentes"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Que ficheiros quere conservar?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Continuar"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(todo o seleccionado)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} seleccionados)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Produciuse un erro ao cargar o modelo de ficheiro existente"
 
@@ -292,12 +292,12 @@ msgstr "Compartir"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Erro"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Produciuse un erro ao compartir"
 
@@ -325,107 +325,116 @@ msgstr "Compartir cun usuario ou grupo ..."
 msgid "Share link"
 msgstr "Ligazón para compartir"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "A ligazón pública caducará, a máis tardar, {days} días após a súa creación"
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr "De xeito predeterminado, a ligazón pública caduca aos {days} días"
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Protexido con contrasinais"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Contrasinal"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr "Escolla un contrasinal para a ligazón pública"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Permitir o envío público"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Enviar ligazón por correo"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Definir a data de caducidade"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Data de caducidade"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Compartir por correo:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Non se atopou xente"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Non se permite volver a compartir"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Deixar de compartir"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "notificar por correo"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Protexido con contrasinal"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Produciuse un erro ao retirar a data de caducidade"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Produciuse un erro ao definir a data de caducidade"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Correo enviado"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Aviso"
 
@@ -669,6 +678,10 @@ msgstr "Para obter información sobre como como configurar axeitadamente o seu s
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear unha <strong>contra de administrador</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Contrasinal"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Almacenamento e base de datos"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 7e2aaf64c9..8facac4da7 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +29,7 @@ msgstr "Non foi posíbel mover %s; Xa existe un ficheiro con ese nome."
 msgid "Could not move %s"
 msgstr "Non foi posíbel mover %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "O nome de ficheiro non pode estar baleiro"
 
@@ -38,18 +38,18 @@ msgstr "O nome de ficheiro non pode estar baleiro"
 msgid "\"%s\" is an invalid file name."
 msgstr "«%s» é un nome incorrecto de ficheiro."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*»."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "O cartafol de destino foi movido ou eliminado."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -141,28 +141,32 @@ msgstr "O envío fracasou. Non foi posíbel obter información do ficheiro."
 msgid "Invalid directory."
 msgstr "O directorio é incorrecto."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Ficheiros"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Todos os ficheiros"
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "O tamaño total do ficheiro {size1} excede do límite de envío {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 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:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Envío cancelado."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Non foi posíbel obter o resultado do servidor."
 
@@ -175,131 +179,135 @@ msgstr "O envío do ficheiro está en proceso. Saír agora da páxina cancelará
 msgid "URL cannot be empty"
 msgstr "O URL non pode quedar en branco."
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "Xa existe un {new_name}"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Non foi posíbel crear o ficheiro"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Non foi posíbel crear o cartafol"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Produciuse un erro ao obter o URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Produciuse un erro ao mover o ficheiro"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Erro"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Produciuse un erro ao mover o ficheiro."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Produciuse un erro ao mover o ficheiro"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Erro"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Non foi posíbel renomear o ficheiro"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Produciuse un erro ao eliminar o ficheiro."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nome"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Tamaño"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Modificado"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n cartafol"
 msgstr[1] "%n cartafoles"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n ficheiro"
 msgstr[1] "%n ficheiros"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} e {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Cargando %n ficheiro"
 msgstr[1] "Cargando %n ficheiros"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "«{name}» é un nome incorrecto de ficheiro."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "O aplicativo de cifrado está activado, mais as chaves non foron inicializadas, saia da sesión e volva a acceder de novo"
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "A chave privada para o aplicativo de cifrado non é correcta. Actualice o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} e {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nome"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Tamaño"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Modificado"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s non pode cambiar de nome"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Envío (máx. %s)"
@@ -336,68 +344,75 @@ msgstr "Tamaño máximo de descarga para os ficheiros ZIP"
 msgid "Save"
 msgstr "Gardar"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Empregue esta ligazón para  <a href=\"%s\" target=\"_blank\">acceder aos seus ficheiros mediante WebDAV</a>"
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Novo"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Ficheiro novo de texto"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Ficheiro de texto"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Novo cartafol"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Cartafol"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Desde a ligazón"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Ficheiros eliminados"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Cancelar o envío"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Aquí non hai nada. Envíe algo."
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Envío demasiado grande"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Estanse analizando os ficheiros. Agarde."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Análise actual"
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index cdc233fcea..1833379260 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/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-04-10 01:54-0400\n"
-"PO-Revision-Date: 2014-04-09 07:40+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,166 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Local"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Localización"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Clave"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Secreto"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr "Bucket"
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr "Amazon S3 e compatíbeis"
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "Clave de acceso"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Clave secreta"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "Nome de máquina (opcional)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Porto (opcional)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Rexión (opcional)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Activar SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr "Activar o estilo de ruta"
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "Clave da API"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr "Secreto do aplicativo"
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Servidor"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Nome de usuario"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Contrasinal"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Root (raíz)"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "ftps:// seguro"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "ID do cliente"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr "Secreto do cliente"
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr "OpenStack Object Storage"
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Nome de usuario (obrigatorio)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr "Bucket (obrigatorio)"
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr "Rexión (opcional para OpenStack Object Storage)"
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr "Clave da API (obrigatoria para Rackspace Cloud Files)"
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr "Nome do inquilino (obrigatorio para OpenStack Object Storage)"
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr "Contrasinal (obrigatorio para OpenStack Object Storage)"
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr "Nome do servizo (obrigatorio para OpenStack Object Storage)"
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr "URL do punto final da identidade (obrigatorio para OpenStack Object Storage)"
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr "Tempo de espera de peticións HTTP en segundos (opcional)"
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Compartir"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr "SMB / CIFS usando acceso OC"
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr "Nome de usuario como compartición"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "https:// seguro"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "Subcartafol remoto"
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Concedeuse acceso"
@@ -42,29 +202,29 @@ msgstr "Produciuse un erro ao configurar o almacenamento en Google Drive"
 msgid "Saved"
 msgstr "Gardado"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Nota:</b> "
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr "e"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 "<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:626
+#: lib/config.php:623
 #, 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 "<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:628
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index 6fb6533da1..aa751ae3df 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 08:50+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +19,7 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Compartido por {owner}"
 
@@ -59,16 +59,15 @@ msgstr "foi desactivada a compartición"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para obter máis información, pregúntelle á persoa que lle enviou a ligazón."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "compartido por %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Descargar"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Descargar %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Ligazón directa"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index ce244ca039..8800ee24e1 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Non foi posíbel eliminar %s permanente"
 msgid "Couldn't restore %s"
 msgstr "Non foi posíbel restaurar %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Ficheiros eliminados"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Erro"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Ficheiros eliminados"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "restaurado"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Aquí non hai nada. O cesto do lixo está baleiro!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nome"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Restablecer"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Erro"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "restaurado"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Aquí non hai nada. O cesto do lixo está baleiro!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nome"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Eliminar"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index 91e171ec87..ac2ff0efbe 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 12:20+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 12:54+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,13 +19,16 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Esta accedendo desde un dominio non fiábel."
 
-#: base.php:724
-msgid "Please contact your administrator"
-msgstr "Contacte co administrador"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr "Póñase en contacto co administrador. Se vostede é administrador desta instancia, configure o parámetro «trusted_domain» en config/config.php. Dispón dun exemplo de configuración en config/config.sample.php."
 
 #: private/app.php:236
 #, php-format
@@ -75,23 +78,23 @@ msgstr "Imaxe incorrecta"
 msgid "web services under your control"
 msgstr "servizos web baixo o seu control"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "As descargas ZIP están desactivadas."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros necesitan seren descargados dun en un."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Volver aos ficheiros"
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -277,19 +280,19 @@ msgstr "Estabeleza un nome de usuario administrador"
 msgid "Set an admin password."
 msgstr "Estabeleza un contrasinal de administrador"
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s compartiu «%s» con vostede"
@@ -331,73 +334,79 @@ msgstr "Fallou a compartición de %s, o grupo %s non existe"
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Fallou a compartición de %s, %s non é membro do grupo %s"
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Ten que fornecer un contrasinal para a ligazón pública, só se permiten ligazóns protexidas"
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Fallou a compartición de %s, non está permitido compartir con ligazóns"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Non se admite a compartición do tipo %s para %s"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Non é posíbel estabelecer permisos para %s, os permisos superan os permisos concedidos a %s"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Non é posíbel estabelecer permisos para %s, non se atopa o elemento"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "A infraestrutura de compartición %s ten que implementar a interface OCP\\Share_Backend"
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Non se atopou a infraestrutura de compartición %s"
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Non se atopou a infraestrutura de compartición para %s"
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Fallou a compartición de %s, compartición orixinal é do usuario %s"
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Fallou a compartición de %s, os permisos superan os permisos concedidos a %s"
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Fallou a compartición de %s, non está permitido repetir a compartción"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Fallou a compartición de %s, a infraestrutura de compartición para %s non foi quen de atopar a orixe"
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr "Fallou a compartición de %s, non foi posíbel atopar o ficheiro na caché de ficheiros"
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Non foi posíbel atopar a categoría «%s»"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 83ef009792..aad195bf0a 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Modo de envío"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
@@ -100,6 +100,16 @@ msgstr "Non foi posíbel descifrar os seus ficheiros. revise o ficheiro de rexis
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Non foi posíbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo"
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "As chaves de cifrado foron eliminadas permanentemente"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Non foi posíbel eliminar permanentemente as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador"
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Correo gardado"
@@ -116,6 +126,16 @@ msgstr "Non é posíbel eliminar o grupo."
 msgid "Unable to delete user"
 msgstr "Non é posíbel eliminar o usuario"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "As copias de seguranza foron restauradas satisfactoriamente"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Non foi posíbel restaurar as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador"
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "O idioma cambiou"
@@ -171,7 +191,7 @@ msgstr "A infraestrutura non admite o cambio de contrasinal, mais a chave de cif
 msgid "Unable to change password"
 msgstr "Non é posíbel cambiar o contrasinal"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Enviando..."
 
@@ -227,34 +247,42 @@ msgstr "Actualizar"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Seleccione unha imaxe para o perfil"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Contrasinal moi feble"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Contrasinal feble"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Contrasinal non moi aló"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Bo contrasinal"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Contrasinal forte"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Descifrando ficheiros... isto pode levar un anaco."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Eliminar permanentemente as chaves de cifrado."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Restaurar as chaves de cifrado."
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "eliminado"
@@ -300,7 +328,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Galego"
 
@@ -488,148 +516,143 @@ msgstr "Permitir que os aplicativos empreguen o API para compartir"
 msgid "Allow links"
 msgstr "Permitir ligazóns"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr "Forzar a protección por contrasinal"
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Permitir os envíos públicos"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Permitir compartir"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Permitir que os usuarios compartan con calquera"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Permitir o envío de notificacións por correo"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos"
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
-msgstr ""
+msgstr "Definir a data predeterminada de caducidade"
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr "Caduca após"
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr "días"
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
-msgstr ""
+msgstr "Obrigar a data de caducidade"
+
+#: templates/admin.php:242
+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:252
+msgid "Allow resharing"
+msgstr "Permitir compartir"
+
+#: templates/admin.php:253
+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:260
+msgid "Allow users to share with anyone"
+msgstr "Permitir que os usuarios compartan con calquera"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
-msgstr "As comparticións, de xeito predeterminado, caducan aos N días"
+msgid "Allow mail notification"
+msgstr "Permitir o envío de notificacións por correo"
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos"
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Seguranza"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "Servidor de correo"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Isto utilizase para o envío de notificacións."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Desde o enderezo"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Requírese autenticación"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Enderezo do servidor"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Porto"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Credenciais"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "Nome de usuario SMTP"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "Contrasinal SMTP"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Correo de proba dos axustes"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Enviar o correo"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Rexistro"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Nivel de rexistro"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Máis"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -782,29 +805,33 @@ msgstr "Idioma"
 msgid "Help translate"
 msgstr "Axude na tradución"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Contrasinal de acceso"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Descifrar todos os ficheiros"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Restaurar as chaves de cifrado"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Eliminar as chaves de cifrado"
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Nome de acceso"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 746330d17a..ab7eae42d1 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -88,65 +88,65 @@ msgstr "Correcto"
 msgid "Error"
 msgstr "Erro"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuración correcta"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Configuración incorrecta"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Configuración incompleta"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Seleccionar grupos"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Seleccione as clases de obxectos"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Seleccione os atributos"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "A proba de conexión foi satisfactoria"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "A proba de conexión fracasou"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Confirma que quere eliminar a configuración actual do servidor?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Confirmar a eliminación"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "Atopouse %s grupo"
 msgstr[1] "Atopáronse %s grupos"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "Atopouse %s usuario"
 msgstr[1] "Atopáronse %s usuarios"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Máquina incorrecta"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Non foi posíbel atopar a función desexada"
 
diff --git a/l10n/he/core.po b/l10n/he/core.po
index e1f1cdc21e..88857396a7 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -60,207 +60,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "יום ראשון"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "יום שני"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "יום שלישי"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "יום רביעי"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "יום חמישי"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "יום שישי"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "שבת"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "ינואר"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "פברואר"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "מרץ"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "אפריל"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "מאי"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "יוני"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "יולי"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "אוגוסט"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "ספטמבר"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "אוקטובר"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "נובמבר"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "דצמבר"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "הגדרות"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "שמירה…"
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "שניות"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "לפני %n דקה"
 msgstr[1] "לפני %n דקות"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "לפני %n שעה"
 msgstr[1] "לפני %n שעות"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "היום"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "אתמול"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "לפני %n יום"
 msgstr[1] "לפני %n ימים"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "חודש שעבר"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "לפני %n חודש"
 msgstr[1] "לפני %n חודשים"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "שנה שעברה"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "שנים"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "בחירה"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "כן"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "לא"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "בחירה"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "בסדר"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "קבצים חדשים"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "ביטול"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -292,12 +292,12 @@ msgstr "שותף"
 msgid "Share"
 msgstr "שתף"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "שגיאה"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "שגיאה במהלך השיתוף"
 
@@ -325,107 +325,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "הגנה בססמה"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "סיסמא"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "שליחת קישור בדוא״ל למשתמש"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "שליחה"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "הגדרת תאריך תפוגה"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "תאריך התפוגה"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "שיתוף באמצעות דוא״ל:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "לא נמצאו אנשים"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "קבוצה"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "אסור לעשות שיתוף מחדש"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "שותף תחת {item} עם {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "הסר שיתוף"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "ניתן לערוך"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "בקרת גישה"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "יצירה"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "עדכון"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "מחיקה"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "שיתוף"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "מוגן בססמה"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "אירעה שגיאה בביטול תאריך התפוגה"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "אירעה שגיאה בעת הגדרת תאריך התפוגה"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "מתבצעת שליחה ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "הודעת הדוא״ל נשלחה"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "אזהרה"
 
@@ -669,6 +678,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "יצירת <strong>חשבון מנהל</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "סיסמא"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 496e6e3c4b..433b77b325 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -29,7 +29,7 @@ msgstr "לא ניתן להעביר את %s - קובץ בשם הזה כבר קי
 msgid "Could not move %s"
 msgstr "לא ניתן להעביר את %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "שם קובץ אינו יכול להיות ריק"
 
@@ -38,18 +38,18 @@ msgstr "שם קובץ אינו יכול להיות ריק"
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -141,28 +141,32 @@ msgstr "העלאה נכשלה. לא ניתן להשיג את פרטי הקובץ
 msgid "Invalid directory."
 msgstr "תיקייה שגויה."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "קבצים"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "ההעלאה בוטלה."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "לא ניתן לגשת לתוצאות מהשרת."
 
@@ -175,131 +179,135 @@ msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד ת
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} כבר קיים"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "שתף"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "מחק לצמיתות"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "שינוי שם"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "שגיאה"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "ממתין"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "שגיאה"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "שם"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "גודל"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "זמן שינוי"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "שטח האחסון שלך כמעט מלא ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "שם"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "גודל"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "זמן שינוי"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -336,68 +344,75 @@ msgstr "גודל הקלט המרבי לקובצי ZIP"
 msgid "Save"
 msgstr "שמירה"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "חדש"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "קובץ טקסט"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "תיקייה"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "מקישור"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "קבצים שנמחקו"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "ביטול ההעלאה"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "אין כאן שום דבר. אולי ברצונך להעלות משהו?"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "מחיקה"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "העלאה גדולה מידי"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה."
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "הקבצים נסרקים, נא להמתין."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "הסריקה הנוכחית"
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index 8b8cb74a27..4860886ee3 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -17,6 +17,166 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "מיקום"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "מארח"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "שם משתמש"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "סיסמא"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "שיתוף"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "כתובת"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "הוענקה גישה"
@@ -41,29 +201,29 @@ msgstr "אירעה שגיאה בעת הגדרת אחסון ב־Google Drive"
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index 16b4ac0d82..789a4cc5ff 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:20+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "שותף בידי {owner}"
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "הורדה"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index 7c8a27c14a..37e63ba407 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -29,38 +29,34 @@ msgstr "לא ניתן למחוק את %s לצמיתות"
 msgid "Couldn't restore %s"
 msgstr "לא ניתן לשחזר את %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "שם"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "שחזור"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "שגיאה"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "שוחזר"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "אין כאן שום דבר. סל המיחזור שלך ריק!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "שם"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "נמחק"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "מחיקה"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index e7a0612123..8099b868e6 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -17,12 +17,15 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "שירותי רשת תחת השליטה שלך"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "הורדת ZIP כבויה"
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "יש להוריד את הקבצים אחד אחרי השני."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "חזרה לקבצים"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "הקבצים הנבחרים גדולים מידי ליצירת קובץ zip."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>."
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s שיתף/שיתפה איתך את »%s«"
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "לא ניתן למצוא את הקטגוריה „%s“"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 4a0f27ab40..e81ed35cf8 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "הצפנה"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -99,6 +99,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "הדוא״ל נשמר"
@@ -115,6 +125,16 @@ msgstr "לא ניתן למחוק את הקבוצה"
 msgid "Unable to delete user"
 msgstr "לא ניתן למחוק את המשתמש"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "שפה השתנתה"
@@ -170,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -226,34 +246,42 @@ msgstr "עדכון"
 msgid "Updated"
 msgstr "מעודכן"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "נמחק"
@@ -299,7 +327,7 @@ msgstr "יש לספק ססמה תקנית"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "עברית"
 
@@ -487,148 +515,143 @@ msgstr "לאפשר ליישום להשתמש ב־API השיתוף"
 msgid "Allow links"
 msgstr "לאפשר קישורים"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "לאפשר למשתמשים לשתף פריטים "
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "לאפשר למשתמשים לשתף פריטים "
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "לאפשר שיתוף מחדש"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "לאפשר למשתמשים לשתף הלאה פריטים ששותפו אתם"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "לאפשר למשתמשים לשתף עם כל אחד"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "לאפשר למשתמשים לשתף עם משתמשים בקבוצות שלהם בלבד"
+
 #: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "אבטחה"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "לאלץ HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "כתובת שרת"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "פורט"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "פרטי גישה"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "יומן"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "רמת הדיווח"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "יותר"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "פחות"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "גרסא"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +804,33 @@ msgstr "פה"
 msgid "Help translate"
 msgstr "עזרה בתרגום"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "שם כניסה"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index a077d25cad..77005f7dfe 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -87,65 +87,65 @@ msgstr ""
 msgid "Error"
 msgstr "שגיאה"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "בדיקת החיבור עברה בהצלחה"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "בדיקת החיבור נכשלה"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "האם אכן למחוק את הגדרות השרת הנוכחיות?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "אישור המחיקה"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 2ec39b5235..999170c581 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -60,207 +60,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "रविवार"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "सोमवार"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "मंगलवार"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "बुधवार"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "बृहस्पतिवार"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "शुक्रवार"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "शनिवार"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "जनवरी"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "फरवरी"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "मार्च"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "अप्रैल"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "मई"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "जून"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "जुलाई"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "अगस्त"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "सितम्बर"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "अक्टूबर"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "नवंबर"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "दिसम्बर"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "सेटिंग्स"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -292,12 +292,12 @@ msgstr ""
 msgid "Share"
 msgstr "साझा करें"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "त्रुटि"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -325,107 +325,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr "भेजें"
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "कोई व्यक्ति नहीं मिले "
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "भेजा जा रहा है"
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "ईमेल भेज दिया गया है "
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "चेतावनी "
 
@@ -669,6 +678,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "व्यवस्थापक खाता बनाएँ"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "पासवर्ड"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 855fb53f40..7b96860f52 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "साझा करें"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "त्रुटि"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "त्रुटि"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr "सहेजें"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/hi/files_external.po b/l10n/hi/files_external.po
index 3f24d3235b..e91207b3c2 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "प्रयोक्ता का नाम"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "पासवर्ड"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "साझा करें"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index 810bbf305c..0b20669aec 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po
index 52aeadc9ba..f6d8073901 100644
--- a/l10n/hi/files_trashbin.po
+++ b/l10n/hi/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr ""
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "त्रुटि"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index 3e99b87307..f3b9a5697f 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index 32ba2807f8..c4d4b38cfd 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr "अद्यतन"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index fefe1fb85a..940faf5c6f 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "त्रुटि"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr[1] ""
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:984
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/hi_IN/core.po b/l10n/hi_IN/core.po
new file mode 100644
index 0000000000..a39407f025
--- /dev/null
+++ b/l10n/hi_IN/core.po
@@ -0,0 +1,818 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi_IN\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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:483
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:583
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1240
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1241
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1242
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1243
+msgid "today"
+msgstr ""
+
+#: js/js.js:1244
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1245
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1246
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1247
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1248
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1249
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+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:761
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:160 js/share.js:824
+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:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:289
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:292
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:336 js/share.js:397
+msgid "group"
+msgstr ""
+
+#: js/share.js:369
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:413
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:435
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:443
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:446
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:448
+msgid "access control"
+msgstr ""
+
+#: js/share.js:451
+msgid "create"
+msgstr ""
+
+#: js/share.js:454
+msgid "update"
+msgstr ""
+
+#: js/share.js:457
+msgid "delete"
+msgstr ""
+
+#: js/share.js:460
+msgid "share"
+msgstr ""
+
+#: js/share.js:742
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:761
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:782
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:811
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:822
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:846
+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:264
+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:60 templates/login.php:40
+msgid "Password"
+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/hi_IN/files.po b/l10n/hi_IN/files.po
new file mode 100644
index 0000000000..7de84b50d1
--- /dev/null
+++ b/l10n/hi_IN/files.po
@@ -0,0 +1,416 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi_IN\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:103
+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:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, 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:169
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:179
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:194
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1672
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1335
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1580 js/filelist.js:1619
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+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:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+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/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/hi_IN/files_encryption.po b/l10n/hi_IN/files_encryption.po
new file mode 100644
index 0000000000..aaaade5301
--- /dev/null
+++ b/l10n/hi_IN/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-30 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi_IN\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/hi_IN/files_external.po b/l10n/hi_IN/files_external.po
new file mode 100644
index 0000000000..b6de970ffe
--- /dev/null
+++ b/l10n/hi_IN/files_external.po
@@ -0,0 +1,296 @@
+# 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-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: 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:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, 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:623
+#, 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:625
+#, 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/hi_IN/files_sharing.po b/l10n/hi_IN/files_sharing.po
new file mode 100644
index 0000000000..f8e42e4b82
--- /dev/null
+++ b/l10n/hi_IN/files_sharing.po
@@ -0,0 +1,71 @@
+# 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-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi_IN\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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:53
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:57
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/hi_IN/files_trashbin.po b/l10n/hi_IN/files_trashbin.po
new file mode 100644
index 0000000000..abb5d87ac5
--- /dev/null
+++ b/l10n/hi_IN/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi_IN\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 ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/hi_IN/files_versions.po b/l10n/hi_IN/files_versions.po
new file mode 100644
index 0000000000..7411ec6cb9
--- /dev/null
+++ b/l10n/hi_IN/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-30 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi_IN\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/hi_IN/lib.po b/l10n/hi_IN/lib.po
new file mode 100644
index 0000000000..81414c5079
--- /dev/null
+++ b/l10n/hi_IN/lib.po
@@ -0,0 +1,476 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:685
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: 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:880
+#, 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:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+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:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+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:164
+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:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:498
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:523
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:529
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:538
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:551 private/share/share.php:579
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:559
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:566
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:645
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:783
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:844
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:955
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:962
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:968
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1383
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1392
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1407
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1419
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1433
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/hi_IN/settings.po b/l10n/hi_IN/settings.po
new file mode 100644
index 0000000000..98a3f40e84
--- /dev/null
+++ b/l10n/hi_IN/settings.po
@@ -0,0 +1,885 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:317
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:354
+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/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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: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:81
+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:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:50 personal.php:51
+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:223
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:230
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:235
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:292
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:294
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:300
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:312
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:314
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:345
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:367
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:380
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:381
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:384
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:388
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:389
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:394
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:395
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:427
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:428
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:434 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:438 templates/personal.php:199
+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:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+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/hi_IN/user_ldap.po b/l10n/hi_IN/user_ldap.po
new file mode 100644
index 0000000000..29026c512f
--- /dev/null
+++ b/l10n/hi_IN/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-30 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi_IN\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:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+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:984
+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 insensitive 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/hi_IN/user_webdavauth.po b/l10n/hi_IN/user_webdavauth.po
new file mode 100644
index 0000000000..8c77a1eef3
--- /dev/null
+++ b/l10n/hi_IN/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-30 01:55-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi_IN\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/hr/core.po b/l10n/hr/core.po
index b8629d3634..92b68ef65d 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,212 +58,212 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "nedelja"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "ponedeljak"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "utorak"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "srijeda"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "četvrtak"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "petak"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "subota"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Siječanj"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Veljača"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Ožujak"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Travanj"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Svibanj"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Lipanj"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Srpanj"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Kolovoz"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Rujan"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Listopad"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Studeni"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Prosinac"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Spremanje..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "danas"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "jučer"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "prošli mjesec"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "prošlu godinu"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "godina"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Izaberi"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Izaberi"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "U redu"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Odustani"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -295,12 +295,12 @@ msgstr ""
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Greška"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Greška prilikom djeljenja"
 
@@ -328,107 +328,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Zaštiti lozinkom"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Lozinka"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Postavi datum isteka"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Datum isteka"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Dijeli preko email-a:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Osobe nisu pronađene"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Ponovo dijeljenje nije dopušteno"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Makni djeljenje"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "može mjenjat"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "kontrola pristupa"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "kreiraj"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "ažuriraj"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "izbriši"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "djeli"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Zaštita lozinkom"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Greška prilikom brisanja datuma isteka"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Greška prilikom postavljanja datuma isteka"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -672,6 +681,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Stvori <strong>administratorski račun</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Lozinka"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 328595c123..782299c24c 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Slanje poništeno."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,134 +177,138 @@ msgstr "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje."
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Promjeni ime"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Greška"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "U tijeku"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Greška"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Ime"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Veličina"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Zadnja promjena"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Ime"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Veličina"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Zadnja promjena"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -337,68 +345,75 @@ msgstr "Maksimalna veličina za ZIP datoteke"
 msgid "Save"
 msgstr "Snimi"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "novo"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "tekstualna datoteka"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "mapa"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Prekini upload"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Nema ničega u ovoj mapi. Pošalji nešto!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Preuzimanje"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Prijenos je preobiman"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Datoteke se skeniraju, molimo pričekajte."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Trenutno skeniranje"
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index 9dab6b27fd..d11898f05d 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ 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"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Lokacija"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Korisničko ime"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Lozinka"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Podijeli"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index faa06e0f5e..f48c260468 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Preuzimanje"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index dad78c7dfa..446092abef 100644
--- a/l10n/hr/files_trashbin.po
+++ b/l10n/hr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Greška"
-
-#: 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 "Ime"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Greška"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Ime"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Obriši"
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 586424f6c7..637ce132b2 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ 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"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "web usluge pod vašom kontrolom"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 9fb9f1a5b6..045ee6e958 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Email spremljen"
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Jezik promijenjen"
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "izbrisano"
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__ime_jezika__"
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "dnevnik"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "više"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr "Jezik"
 msgid "Help translate"
 msgstr "Pomoć prevesti"
 
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Prijava"
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index a737c807fc..604b9f95eb 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Greška"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -146,7 +146,7 @@ msgstr[2] ""
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:984
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 1169062c0e..5518cbbbbc 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# sherlock79 <david@interpont.hu>, 2013
+# sherlock79 <inactive+sherlock79@transifex.com>, 2013
 # ebela <bela@dandre.hu>, 2013
+# aries1980 <feher.janos@mindworks.hu>, 2014
 # Laszlo Tornoci <torlasz@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -22,7 +23,7 @@ msgstr ""
 
 #: ajax/share.php:87
 msgid "Expiration date is in the past."
-msgstr ""
+msgstr "Múltbéli lejárati idő."
 
 #: ajax/share.php:119 ajax/share.php:161
 #, php-format
@@ -61,229 +62,229 @@ msgstr "Az átmeneti profil kép nem elérhető, próbáld újra"
 msgid "No crop data provided"
 msgstr "Vágáshoz nincs adat megadva"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "vasárnap"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "hétfő"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "kedd"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "szerda"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "csütörtök"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "péntek"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "szombat"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "január"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "február"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "március"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "április"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "május"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "június"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "július"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "augusztus"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "szeptember"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "október"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "november"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "december"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Mentés..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "pár másodperce"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n perccel ezelőtt"
 msgstr[1] "%n perccel ezelőtt"
 
-#: js/js.js:1248
+#: js/js.js:1242
 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:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "ma"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "tegnap"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n nappal ezelőtt"
 msgstr[1] "%n nappal ezelőtt"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "múlt hónapban"
 
-#: js/js.js:1253
+#: js/js.js:1247
 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:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "tavaly"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "több éve"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Válasszon"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Nem sikerült betölteni a fájlkiválasztó sablont: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Igen"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nem"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Válasszon"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Nem sikerült betölteni a fájlkiválasztó sablont: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Nem sikerült betölteni az üzenet sablont: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} fájl ütközik"
 msgstr[1] "{count} fájl ütközik"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Egy file ütközik"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Új fájlok"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
-msgstr ""
+msgstr "A fájlok már láteznek"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Melyik file-okat akarod megtartani?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Folytatás"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
-msgstr "(all selected)"
+msgstr "(az összes ki lett választva)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
-msgstr "({count} kiválasztva)"
+msgstr "({count} lett kiválasztva)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Hiba a létező sablon betöltésekor"
 
 #: js/setup.js:84
 msgid "Very weak password"
-msgstr ""
+msgstr "Nagyon gyenge jelszó"
 
 #: js/setup.js:85
 msgid "Weak password"
-msgstr ""
+msgstr "Gyenge jelszó"
 
 #: js/setup.js:86
 msgid "So-so password"
-msgstr ""
+msgstr "Nem túl jó jelszó"
 
 #: js/setup.js:87
 msgid "Good password"
-msgstr ""
+msgstr "Jó jelszó"
 
 #: js/setup.js:88
 msgid "Strong password"
-msgstr ""
+msgstr "Erős jelszó"
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
@@ -293,12 +294,12 @@ msgstr "Megosztott"
 msgid "Share"
 msgstr "Megosztás"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Hiba"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Nem sikerült létrehozni a megosztást"
 
@@ -326,107 +327,116 @@ msgstr "Megosztani egy felhasználóval vagy csoporttal ..."
 msgid "Share link"
 msgstr "Megosztás hivatkozással"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Jelszóval is védem"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Jelszó"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Feltöltést is engedélyezek"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Email címre küldjük el"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Küldjük el"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Legyen lejárati idő"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "A lejárati idő"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Megosztás emaillel:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Nincs találat"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "csoport"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Megosztva {item}-ben {user}-rel"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "A megosztás visszavonása"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "email értesítés"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "módosíthat"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "jogosultság"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "létrehoz"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "szerkeszt"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "töröl"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "megoszt"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Jelszóval van védve"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Nem sikerült a lejárati időt törölni"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Nem sikerült a lejárati időt beállítani"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Küldés ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Az emailt elküldtük"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
@@ -482,7 +492,7 @@ msgstr "%s jelszó visszaállítás"
 msgid ""
 "A problem has occurred whilst sending the email, please contact your "
 "administrator."
-msgstr ""
+msgstr "Hiba történt e-mail küldése közben. Érdemes az adminisztrátort értesíteni."
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -545,12 +555,12 @@ msgstr "Jelszó-visszaállítás"
 msgid ""
 "Mac OS X is not supported and %s will not work properly on this platform. "
 "Use it at your own risk! "
-msgstr ""
+msgstr "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Felhasználás csak saját felelősségre!"
 
 #: setup/controller.php:144
 msgid ""
 "For the best results, please consider using a GNU/Linux server instead."
-msgstr ""
+msgstr "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni."
 
 #: strings.php:5
 msgid "Personal"
@@ -670,9 +680,13 @@ msgstr "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a hre
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Rendszergazdai belépés</strong> létrehozása"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Jelszó"
+
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "Tárolás & adatbázis"
 
 #: templates/installation.php:77
 msgid "Data folder"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 2b3289f1b0..94a67901ec 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -29,7 +29,7 @@ msgstr "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a név
 msgid "Could not move %s"
 msgstr "Nem sikerült %s áthelyezése"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "A fájlnév nem lehet semmi."
 
@@ -38,18 +38,18 @@ msgstr "A fájlnév nem lehet semmi."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'"
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -141,28 +141,32 @@ msgstr "A feltöltés nem sikerült. Az állományt leíró információk nem é
 msgid "Invalid directory."
 msgstr "Érvénytelen mappa."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Fájlok"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll."
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "A feltöltést megszakítottuk."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "A kiszolgálótól nem kapható meg az eredmény."
 
@@ -175,131 +179,135 @@ msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a fel
 msgid "URL cannot be empty"
 msgstr "Az URL-cím nem maradhat kitöltetlenül"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} már létezik"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Az állomány nem hozható létre"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "A mappa nem hozható létre"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "A megadott URL-ről nem sikerül adatokat kapni"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Megosztás"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Végleges törlés"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Az állomány áthelyezése nem sikerült."
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Hiba"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Folyamatban"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Az állomány áthelyezése nem sikerült."
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Hiba"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Az állomány nem nevezhető át"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Hiba a file törlése közben."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Név"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Méret"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Módosítva"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappa"
 msgstr[1] "%n mappa"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n állomány"
 msgstr[1] "%n állomány"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} és {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n állomány feltöltése"
 msgstr[1] "%n állomány feltöltése"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben."
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "A tároló majdnem tele van ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!"
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Az állományok titkosításához használt titkos kulcsa érvénytelen. Kérjük frissítse a titkos kulcs jelszót a személyes beállításokban, hogy ismét hozzáférjen a titkosított állományaihoz!"
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "A titkosítási funkciót kikapcsolták, de az Ön állományai még mindig titkosított állapotban vannak. A személyes beállításoknál tudja a titkosítást feloldani."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} és {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Név"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Méret"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Módosítva"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s átnevezése nem sikerült"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -336,68 +344,75 @@ msgstr "ZIP-fájlok maximális kiindulási mérete"
 msgid "Save"
 msgstr "Mentés"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Új"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Új szöveges file"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Szövegfájl"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Új mappa"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Mappa"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Feltöltés linkről"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Törölt fájlok"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "A feltöltés megszakítása"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Itt nincs semmi. Töltsön fel valamit!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Törlés"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "A feltöltés túl nagy"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "A fájllista ellenőrzése zajlik, kis türelmet!"
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Ellenőrzés alatt"
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index 3ef34c0ef5..b55fa68968 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -18,6 +18,166 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Hely"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Kiszolgáló"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Felhasználónév"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Jelszó"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Megosztás"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Érvényes hozzáférés"
@@ -40,31 +200,31 @@ msgstr "A Google Drive tárolót nem sikerült beállítani"
 
 #: js/settings.js:318 js/settings.js:325
 msgid "Saved"
-msgstr ""
+msgstr "Elmentve"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index dd0b394b91..5e18df9e11 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Megosztotta: {owner}"
 
@@ -58,16 +58,15 @@ msgstr "letiltásra került a megosztás"
 msgid "For more info, please ask the person who sent this link."
 msgstr "További információért forduljon ahhoz, aki ezt a linket küldte Önnek!"
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "Megosztotta: %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Letöltés"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Közvetlen link"
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index f8d7db50eb..99148cee1b 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 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"
@@ -28,38 +28,34 @@ msgstr "Nem sikerült %s végleges törlése"
 msgid "Couldn't restore %s"
 msgstr "Nem sikerült %s visszaállítása"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Törölt fájlok"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Hiba"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Törölt fájlok"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "visszaállítva"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Itt nincs semmi. Az Ön szemetes mappája üres!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Név"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Visszaállítás"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Hiba"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "visszaállítva"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Itt nincs semmi. Az Ön szemetes mappája üres!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Név"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Törölve"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Törlés"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index ef59513e38..d9fc92791b 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +20,15 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -76,23 +79,23 @@ msgstr "Hibás kép"
 msgid "web services under your control"
 msgstr "webszolgáltatások saját kézben"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "A ZIP-letöltés nincs engedélyezve."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "A fájlokat egyenként kell letölteni."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Vissza a Fájlokhoz"
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -278,19 +281,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:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s megosztotta Önnel ezt:  »%s«"
@@ -332,73 +335,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Ez a kategória nem található: \"%s\""
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index d9f7418f59..19a58f9af4 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -5,14 +5,14 @@
 # Translators:
 # Adam Toth <adazlord@gmail.com>, 2013
 # sherlock79 <inactive+sherlock79@transifex.com>, 2013
-# ebela <bela@dandre.hu>, 2013
+# ebela <bela@dandre.hu>, 2013-2014
 # Laszlo Tornoci <torlasz@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,15 +28,15 @@ msgstr ""
 
 #: admin/controller.php:73
 msgid "Saved"
-msgstr ""
+msgstr "Elmentve"
 
 #: admin/controller.php:90
 msgid "test email settings"
-msgstr ""
+msgstr "Teszt email beállítások"
 
 #: admin/controller.php:91
 msgid "If you received this email, the settings seem to be correct."
-msgstr ""
+msgstr "Amennyiben megérkezett ez az email akkor a beállítások megfelelők"
 
 #: admin/controller.php:94
 msgid ""
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Titkosítás"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -102,6 +102,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Email mentve"
@@ -118,6 +128,16 @@ msgstr "A csoport nem törölhető"
 msgid "Unable to delete user"
 msgstr "A felhasználó nem törölhető"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "A nyelv megváltozott"
@@ -173,7 +193,7 @@ msgstr "A back-end nem támogatja a jelszó módosítást, de felhasználó titk
 msgid "Unable to change password"
 msgstr "Nem sikerült megváltoztatni a jelszót"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -229,34 +249,42 @@ msgstr "Frissítés"
 msgid "Updated"
 msgstr "Frissítve"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Válassz profil képet"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
-msgstr ""
+msgstr "Nagyon gyenge jelszó"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
-msgstr ""
+msgstr "Gyenge jelszó"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
-msgstr ""
+msgstr "Nem túl jó jelszó"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
-msgstr ""
+msgstr "Jó jelszó"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
-msgstr ""
+msgstr "Erős jelszó"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "File-ok kititkosítása folyamatban... Kérlek várj, ez hosszabb ideig is eltarthat ..."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "törölve"
@@ -302,7 +330,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -490,148 +518,143 @@ msgstr "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást
 msgid "Allow links"
 msgstr "Linkek engedélyezése"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Feltöltést engedélyezése mindenki számára"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "A továbbosztás engedélyezése"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "A felhasználók bárkivel megoszthatják állományaikat"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "E-mail értesítések engedélyezése"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+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:252
+msgid "Allow resharing"
+msgstr "A továbbosztás engedélyezése"
+
+#: templates/admin.php:253
+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:260
+msgid "Allow users to share with anyone"
+msgstr "A felhasználók bárkivel megoszthatják állományaikat"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
+msgstr "E-mail értesítések engedélyezése"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Biztonság"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Kötelező HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "A kiszolgáló címe"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Azonosítók"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Naplózás"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Naplózási szint"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Több"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Kevesebb"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Verzió"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -784,29 +807,33 @@ msgstr "Nyelv"
 msgid "Help translate"
 msgstr "Segítsen a fordításban!"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Bejelentkezési jelszó"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Kititkosítja az összes file-t"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Bejelentkezési név"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index d7e1b277b2..896074067f 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ebela <bela@dandre.hu>, 2013
+# ebela <bela@dandre.hu>, 2013-2014
 # Laszlo Tornoci <torlasz@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: ebela <bela@dandre.hu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,65 +88,65 @@ msgstr "Sikeres végrehajtás"
 msgid "Error"
 msgstr "Hiba"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfiguráció OK"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Konfiguráió hibás"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Konfiguráció nincs befejezve"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Csoportok kiválasztása"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Objektumosztályok kiválasztása"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Attribútumok kiválasztása"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "A kapcsolatellenőrzés eredménye: sikerült"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "A kapcsolatellenőrzés eredménye: nem sikerült"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Tényleg törölni szeretné a kiszolgáló beállításait?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "A törlés megerősítése"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s csoport van"
 msgstr[1] "%s csoport van"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s felhasználó van"
 msgstr[1] "%s felhasználó van"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Érvénytelen gépnév"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "A kívánt funkció nem található"
 
@@ -413,7 +413,7 @@ msgstr "A csoporttagság attribútuma"
 
 #: templates/settings.php:39
 msgid "Nested Groups"
-msgstr ""
+msgstr "Egymásba ágyazott csoportok"
 
 #: templates/settings.php:39
 msgid ""
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index dc7320cd4d..3dd1f7bd8e 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Կիրակի"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Երկուշաբթի"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Երեքշաբթի"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Չորեքշաբթի"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Հինգշաբթի"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Ուրբաթ"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Շաբաթ"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Հունվար"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Փետրվար"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Մարտ"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Ապրիլ"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Մայիս"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Հունիս"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Հուլիս"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Օգոստոս"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Սեպտեմբեր"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Հոկտեմբեր"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Նոյեմբեր"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Դեկտեմբեր"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 9ffd18d4f8..09cea5b417 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr "Պահպանել"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Բեռնել"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Ջնջել"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index 5d5b3cfe32..bcebe524b5 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index 3948e67f64..72f66cb453 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-04 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 06:12+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,7 +17,7 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Բեռնել"
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po
index f41cdd7798..869e6b5ce2 100644
--- a/l10n/hy/files_trashbin.po
+++ b/l10n/hy/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Ջնջել"
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index fdd86ad09c..5e039d25b9 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index b80e564d9e..030d5c62c2 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 87fa0438cd..c1f494a536 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 15:10+0000\n"
-"Last-Translator: giogio <g.sora@tiscali.it>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,79 +59,79 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Dominica"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Lunedi"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Martedi"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Mercuridi"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Jovedi"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Venerdi"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sabbato"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "januario"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februario"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Martio"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "April"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Junio"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Julio"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Augusto"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Septembre"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Octobre"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Novembre"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Decembre"
 
@@ -191,75 +191,75 @@ msgstr "ultime anno"
 msgid "years ago"
 msgstr "annos passate"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Seliger"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Si"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Seliger"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} conflicto de file"
 msgstr[1] "{count} conflictos de file"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Un conflicto de file"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Nove files"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Files jam existente"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Qual files tu vole mantener?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Cancellar"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Continuar"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Error quando on incargava patrono de file existente"
 
@@ -291,12 +291,12 @@ msgstr "Compartite"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Error quando on compartiva"
 
@@ -324,107 +324,116 @@ msgstr "Compartir con usator o gruppo ..."
 msgid "Share link"
 msgstr "Compartir ligamine"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Protegite per contrasigno"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Contrasigno"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Permitter incargamento public"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Ligamine de e-posta a persona"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Invia"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Fixa data de expiration"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Data de expiration"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Compartir via e-posta:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Il trovava nulle persona"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "gruppo"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Il non es permittite compartir plus que un vice"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Compartite in  {item} con {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Leva compartir"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "notificar per message de e-posta"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "pote modificar"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "controlo de accesso"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "actualisar"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "deler"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Proteger con contrasigno"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Error quando on levava le data de expiration"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Error quando on fixava le data de expiration"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Inviante ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Message de e-posta inviate"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Aviso"
 
@@ -668,6 +677,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear un <strong>conto de administration</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Contrasigno"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Immagazinage & base de datos"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 96ac1fa27c..94e627c3e7 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Files"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Error"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Error"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nomine"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Dimension"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Modificate"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nomine"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Dimension"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Modificate"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr "Salveguardar"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Nove"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "File de texto"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nove dossier"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Dossier"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Nihil hic. Incarga alcun cosa!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Deler"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Incargamento troppo longe"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index c94d75f85c..e033b8dc53 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 15:30+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Loco"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Nomine de usator"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Contrasigno"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Compartir"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:598
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:608
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:630
+#: lib/config.php:621
 #, 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:632
+#: lib/config.php:623
 #, 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:634
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index e379fe15ec..e6abbef3c8 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Discargar"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index 729956da02..555a2b40ef 100644
--- a/l10n/ia/files_trashbin.po
+++ b/l10n/ia/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Error"
-
-#: 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 "Nomine"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Error"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nomine"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Deler"
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index 331c7c30f4..4f1a86c2e4 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr "Imagine invalide"
 msgid "web services under your control"
 msgstr "servicios web sub tu controlo"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 9291c01ff9..7d255d5a90 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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 "Message de e-posta inviate"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Linguage cambiate"
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr "Actualisar"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Contrasigno multo debile"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Contrasigno debile"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Contrasigno passabile"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Contrasigno bon"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Contrasigno forte"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Interlingua"
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Plus"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr "Linguage"
 msgid "Help translate"
 msgstr "Adjuta a traducer"
 
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 05e1a6a247..68b77da82d 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 15:10+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index b0a81a4b5b..d6ad306a89 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Arif Budiman <arifpedia@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,224 +59,224 @@ msgstr "Tidak ada gambar profil sementara yang tersedia, coba lagi"
 msgid "No crop data provided"
 msgstr "Tidak ada data krop tersedia"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Minggu"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Senin"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Rabu"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Kamis"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Jumat"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Januari"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februari"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Maret"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "April"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mei"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Agustus"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Pengaturan"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Menyimpan..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n menit yang lalu"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n jam yang lalu"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "hari ini"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "kemarin"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n hari yang lalu"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n bulan yang lalu"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Pilih"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Galat memuat templat berkas pemilih: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Ya"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Tidak"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Pilih"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Galat memuat templat berkas pemilih: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Oke"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Galat memuat templat pesan: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} berkas konflik"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Satu berkas konflik"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
-msgstr ""
+msgstr "Berkas Baru"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
-msgstr ""
+msgstr "Berkas sudah ada"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Berkas mana yang ingin anda pertahankan?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Batal"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Lanjutkan"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(semua terpilih)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} terpilih)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Galat memuat templat berkas yang sudah ada"
 
 #: js/setup.js:84
 msgid "Very weak password"
-msgstr ""
+msgstr "Sandi sangat lemah"
 
 #: js/setup.js:85
 msgid "Weak password"
-msgstr ""
+msgstr "Sandi lemah"
 
 #: js/setup.js:86
 msgid "So-so password"
-msgstr ""
+msgstr "Sandi lumayan"
 
 #: js/setup.js:87
 msgid "Good password"
-msgstr ""
+msgstr "Sandi baik"
 
 #: js/setup.js:88
 msgid "Strong password"
-msgstr ""
+msgstr "Sandi kuat"
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
@@ -285,12 +286,12 @@ msgstr "Dibagikan"
 msgid "Share"
 msgstr "Bagikan"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Galat"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Galat ketika membagikan"
 
@@ -318,107 +319,116 @@ msgstr "Bagikan dengan pengguna atau grup ..."
 msgid "Share link"
 msgstr "Bagikan tautan"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Lindungi dengan sandi"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Sandi"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Izinkan Unggahan Publik"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Emailkan tautan ini ke orang"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Kirim"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Atur tanggal kedaluwarsa"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Tanggal kedaluwarsa"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Bagian lewat email:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Tidak ada orang ditemukan"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grup"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Berbagi ulang tidak diizinkan"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Dibagikan dalam {item} dengan {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Batalkan berbagi"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "notifikasi via email"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "dapat sunting"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "kontrol akses"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "buat"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "perbarui"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "hapus"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "bagikan"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Sandi dilindungi"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Galat ketika menghapus tanggal kedaluwarsa"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Galat ketika mengatur tanggal kedaluwarsa"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Mengirim ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Email terkirim"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Peringatan"
 
@@ -474,7 +484,7 @@ msgstr "%s sandi diatur ulang"
 msgid ""
 "A problem has occurred whilst sending the email, please contact your "
 "administrator."
-msgstr ""
+msgstr "Terjadi masalah saat mengirim email, silakan hubungi administrator Anda."
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -537,12 +547,12 @@ msgstr "Atur ulang sandi"
 msgid ""
 "Mac OS X is not supported and %s will not work properly on this platform. "
 "Use it at your own risk! "
-msgstr ""
+msgstr "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!"
 
 #: setup/controller.php:144
 msgid ""
 "For the best results, please consider using a GNU/Linux server instead."
-msgstr ""
+msgstr "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. "
 
 #: strings.php:5
 msgid "Personal"
@@ -662,9 +672,13 @@ msgstr "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan l
 msgid "Create an <strong>admin account</strong>"
 msgstr "Buat sebuah <strong>akun admin</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Sandi"
+
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "Penyimpanan & Basis data"
 
 #: templates/installation.php:77
 msgid "Data folder"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 80fb510d8c..afb3e1ac87 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# arifpedia <arifpedia@gmail.com>, 2013
+# Arif Budiman <arifpedia@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -28,7 +28,7 @@ msgstr "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada"
 msgid "Could not move %s"
 msgstr "Tidak dapat memindahkan %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Nama berkas tidak boleh kosong."
 
@@ -37,18 +37,18 @@ msgstr "Nama berkas tidak boleh kosong."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -140,28 +140,32 @@ msgstr "Unggah gagal. Tidak mendapatkan informasi berkas."
 msgid "Invalid directory."
 msgstr "Direktori tidak valid."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Berkas"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Tidak dapat mengunggah {filename} karena ini sebuah direktori atau memiliki ukuran 0 byte"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Pengunggahan dibatalkan."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Tidak mendapatkan hasil dari server."
 
@@ -174,128 +178,132 @@ msgstr "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses
 msgid "URL cannot be empty"
 msgstr "URL tidak boleh kosong"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} sudah ada"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Tidak dapat membuat berkas"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Tidak dapat membuat folder"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Bagikan"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Hapus secara permanen"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Ubah nama"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Galat saat memindahkan berkas"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Galat"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Menunggu"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Galat saat memindahkan berkas"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Galat"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Tidak dapat mengubah nama berkas"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Galat saat menghapus berkas."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nama"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Ukuran"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Dimodifikasi"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n folder"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n berkas"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} dan {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Mengunggah %n berkas"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi"
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silakan menuju ke pengaturan pribadi untuk deskrip berkas anda."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} dan {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nama"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Ukuran"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Dimodifikasi"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s tidak dapat diubah nama"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -332,68 +340,75 @@ msgstr "Ukuran masukan maksimum untuk berkas ZIP"
 msgid "Save"
 msgstr "Simpan"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Baru"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Berkas teks baru"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Berkas teks"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Map baru"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Dari tautan"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Berkas yang dihapus"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Batal pengunggahan"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Hapus"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Yang diunggah terlalu besar"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Berkas sedang dipindai, silakan tunggu."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Yang sedang dipindai"
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
index e93bf83ccc..1b7ecafc31 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/files_external.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Arif Budiman <arifpedia@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-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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,6 +18,166 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Lokal"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "lokasi"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "Hostname (tambahan)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Port (tambahan)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Wilayah (tambahan)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Aktifkan SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Nama Pengguna"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Sandi"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Root"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Nama pengguna (dibutuhkan)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Bagikan"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "tautan"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Akses diberikan"
@@ -39,36 +200,36 @@ msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive"
 
 #: js/settings.js:318 js/settings.js:325
 msgid "Saved"
-msgstr ""
+msgstr "Disimpan"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>Catatan:</b> "
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
-msgstr ""
+msgstr "dan"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 ""
+msgstr "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya."
 
-#: lib/config.php:626
+#: lib/config.php:623
 #, 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 ""
+msgstr "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya."
 
-#: lib/config.php:628
+#: lib/config.php:625
 #, 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 ""
+msgstr "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya."
 
 #: templates/settings.php:2
 msgid "External Storage"
@@ -92,7 +253,7 @@ msgstr "Opsi"
 
 #: templates/settings.php:12
 msgid "Available for"
-msgstr ""
+msgstr "Tersedia untuk"
 
 #: templates/settings.php:32
 msgid "Add storage"
@@ -100,7 +261,7 @@ msgstr "Tambahkan penyimpanan"
 
 #: templates/settings.php:92
 msgid "No user or group"
-msgstr ""
+msgstr "Tidak ada pengguna dan grup"
 
 #: templates/settings.php:95
 msgid "All Users"
@@ -125,7 +286,7 @@ msgstr "Aktifkan Penyimpanan Eksternal Pengguna"
 
 #: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut"
 
 #: templates/settings.php:150
 msgid "SSL root certificates"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index e87d19ae3e..5beed755f1 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# arifpedia <arifpedia@gmail.com>, 2014
+# Arif Budiman <arifpedia@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"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +18,7 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Dibagikan oleh {owner}"
 
@@ -58,16 +58,15 @@ msgstr "berbagi dinonaktifkan"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Untuk info lebih lanjut, silakan tanyakan orang yang mengirim tautan ini."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr ""
+#: templates/public.php:21
+msgid "Download"
+msgstr "Unduh"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Tautan langsung"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index a91067fa67..50cb9418c1 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr "Tidak dapat menghapus permanen %s"
 msgid "Couldn't restore %s"
 msgstr "Tidak dapat memulihkan %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Berkas yang dihapus"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Galat"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Berkas yang Dihapus"
-
-#: 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 "Tempat sampah anda kosong!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nama"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Pulihkan"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Galat"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Tempat sampah anda kosong!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nama"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Dihapus"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Hapus"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index 90b9921303..d0289cb501 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr "Gambar tidak sah"
 msgid "web services under your control"
 msgstr "layanan web dalam kendali anda"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Pengunduhan ZIP dimatikan."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Berkas harus diunduh satu persatu."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Kembali ke Berkas"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Berkas yang dipilih terlalu besar untuk dibuat berkas zip-nya."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr "Atur nama pengguna admin."
 msgid "Set an admin password."
 msgstr "Atur sandi admin."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s membagikan »%s« dengan anda"
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Tidak menemukan kategori \"%s\""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index d5164bb3b0..5b7ac4cd01 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: admin/controller.php:73
 msgid "Saved"
-msgstr ""
+msgstr "Disimpan"
 
 #: admin/controller.php:90
 msgid "test email settings"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Enkripsi"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Email disimpan"
@@ -114,6 +124,16 @@ msgstr "Tidak dapat menghapus grup"
 msgid "Unable to delete user"
 msgstr "Tidak dapat menghapus pengguna"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Bahasa telah diubah"
@@ -169,7 +189,7 @@ msgstr "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengg
 msgid "Unable to change password"
 msgstr "Tidak dapat mengubah sandi"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr "Perbarui"
 msgid "Updated"
 msgstr "Diperbarui"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Pilih foto profil"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
-msgstr ""
+msgstr "Sandi sangat lemah"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
-msgstr ""
+msgstr "Sandi lemah"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
-msgstr ""
+msgstr "Sandi lumayan"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
-msgstr ""
+msgstr "Sandi baik"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
-msgstr ""
+msgstr "Sandi kuat"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Mendeskripsi berkas... Modon tunggu, ini memerlukan beberapa saat."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "dihapus"
@@ -298,7 +326,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -486,148 +514,143 @@ msgstr "Izinkan aplikasi untuk menggunakan API Pembagian"
 msgid "Allow links"
 msgstr "Izinkan tautan"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Izinkan unggahan publik"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Izinkan pembagian ulang"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Izinkan pengguna untuk berbagi kepada siapa saja"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Izinkan pemberitahuan email"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Izinkan pengguna untuk berbagi item kepada publik lewat tautan"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Izinkan pembagian ulang"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Izinkan pengguna untuk berbagi kembali item yang dibagikan kepada mereka."
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Izinkan pengguna untuk berbagi kepada siapa saja"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
+msgstr "Izinkan pemberitahuan email"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Keamanan"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Selalu Gunakan HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Alamat server"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "port"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Catat"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Level pencatatan"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Lainnya"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Ciutkan"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versi"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr "Bahasa"
 msgid "Help translate"
 msgstr "Bantu menerjemahkan"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Sandi masuk"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Deskripsi semua Berkas"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Nama Masuk"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 963d006165..f38a4d7bc8 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -86,63 +86,63 @@ msgstr "Sukses"
 msgid "Error"
 msgstr "Galat"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Pilih grup"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Tes koneksi sukses"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Tes koneksi gagal"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Anda ingin menghapus Konfigurasi Server saat ini?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Konfirmasi Penghapusan"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/is/core.po b/l10n/is/core.po
index fd246d9bca..705e1e52df 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -59,207 +59,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Sunnudagur"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Mánudagur"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Þriðjudagur"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Miðvikudagur"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Fimmtudagur"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Föstudagur"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Laugardagur"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Janúar"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Febrúar"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Apríl"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Maí"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Júní"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Júlí"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Ágúst"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Október"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Nóvember"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Stillingar"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Er að vista ..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "sek."
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "í dag"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "í gær"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "síðasta mánuði"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "síðasta ári"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "einhverjum árum"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Veldu"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Já"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nei"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Veldu"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Í lagi"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,12 +291,12 @@ msgstr "Deilt"
 msgid "Share"
 msgstr "Deila"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Villa"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Villa við deilingu"
 
@@ -324,107 +324,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Verja með lykilorði"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Lykilorð"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Senda vefhlekk í tölvupóstu til notenda"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Senda"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Setja gildistíma"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Gildir til"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Deila með tölvupósti:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Engir notendur fundust"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Endurdeiling er ekki leyfð"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Deilt með {item} ásamt {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Hætta deilingu"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "getur breytt"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "aðgangsstýring"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "mynda"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "uppfæra"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "eyða"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "deila"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Verja með lykilorði"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Villa við að aftengja gildistíma"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Villa við að setja gildistíma"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Sendi ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Tölvupóstur sendur"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Aðvörun"
 
@@ -668,6 +677,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Útbúa <strong>vefstjóra aðgang</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Lykilorð"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/is/files.po b/l10n/is/files.po
index f9cc83e0c1..0d420c9b51 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -27,7 +27,7 @@ msgstr "Gat ekki fært %s - Skrá með þessu nafni er þegar til"
 msgid "Could not move %s"
 msgstr "Gat ekki fært %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Nafn skráar má ekki vera tómt"
 
@@ -36,18 +36,18 @@ msgstr "Nafn skráar má ekki vera tómt"
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr "Ógild mappa."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Skrár"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Hætt við innsendingu."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending mis
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} er þegar til"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Deila"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Endurskýra"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Villa"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Bíður"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Villa"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nafn"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Stærð"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Breytt"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nafn"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Stærð"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Breytt"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr "Hámarks inntaksstærð fyrir ZIP skrár"
 msgid "Save"
 msgstr "Vista"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Nýtt"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Texta skrá"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Mappa"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Af tengli"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Hætta við innsendingu"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Ekkert hér. Settu eitthvað inn!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Niðurhal"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Eyða"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Innsend skrá er of stór"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Er að skima"
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index 5824e83788..c4526a81bb 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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,6 +17,166 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Staðsetning"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Netþjónn"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Notendanafn"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Lykilorð"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Deila"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Aðgengi veitt"
@@ -41,29 +201,29 @@ msgstr "Villa kom upp við að setja upp Google Drive gagnasvæði"
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index 7e43bcdc42..4aea7c4a4e 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Niðurhal"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index efb4a28d4c..4b6f64d426 100644
--- a/l10n/is/files_trashbin.po
+++ b/l10n/is/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Villa"
-
-#: 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 "Nafn"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Villa"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nafn"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Eyða"
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index cce021e1db..015e3d97a8 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "vefþjónusta undir þinni stjórn"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Slökkt á ZIP niðurhali."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Skrárnar verður að sækja eina og eina"
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Aftur í skrár"
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Fann ekki flokkinn \"%s\""
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index d13412cdd7..ea7f595fb9 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Dulkóðun"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -99,6 +99,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Netfang vistað"
@@ -115,6 +125,16 @@ msgstr "Ekki tókst að eyða hóp"
 msgid "Unable to delete user"
 msgstr "Ekki tókst að eyða notenda"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Tungumáli breytt"
@@ -170,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -226,34 +246,42 @@ msgstr "Uppfæra"
 msgid "Updated"
 msgstr "Uppfært"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "eytt"
@@ -299,7 +327,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__nafn_tungumáls__"
 
@@ -487,148 +515,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Host nafn netþjóns"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Meira"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Minna"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Útgáfa"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +804,33 @@ msgstr "Tungumál"
 msgid "Help translate"
 msgstr "Hjálpa við þýðingu"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 69fba0b908..d71825a9a8 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -87,65 +87,65 @@ msgstr ""
 msgid "Error"
 msgstr "Villa"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 1f492f0172..4356079be0 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,207 +62,207 @@ msgstr "Nessuna immagine di profilo provvisoria disponibile, riprova"
 msgid "No crop data provided"
 msgstr "Dati di ritaglio non forniti"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Domenica"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Lunedì"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Martedì"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Mercoledì"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Venerdì"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sabato"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Gennaio"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Febbraio"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Marzo"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Aprile"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Maggio"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Giugno"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Luglio"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Agosto"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Settembre"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Ottobre"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Novembre"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Dicembre"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Salvataggio in corso..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "secondi fa"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minuto fa"
 msgstr[1] "%n minuti fa"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n ora fa"
 msgstr[1] "%n ore fa"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "oggi"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n giorno fa"
 msgstr[1] "%n giorni fa"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "mese scorso"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n mese fa"
 msgstr[1] "%n mesi fa"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "anno scorso"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "anni fa"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Scegli"
-
-#: 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:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Sì"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Scegli"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Errore durante il caricamento del modello del selettore file: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Errore durante il caricamento del modello di messaggio: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 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:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Un file in conflitto"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "File nuovi"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "File già esistenti"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Quali file vuoi mantenere?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Annulla"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Continua"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(tutti i selezionati)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} selezionati)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Errore durante il caricamento del modello del file esistente"
 
@@ -294,12 +294,12 @@ msgstr "Condivisi"
 msgid "Share"
 msgstr "Condividi"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Errore"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Errore durante la condivisione"
 
@@ -327,107 +327,116 @@ msgstr "Condividi con utente o gruppo ..."
 msgid "Share link"
 msgstr "Condividi collegamento"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione"
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr "In modo predefinito, il collegamento pubblico scadrà dopo {days} giorni"
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Proteggi con password"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Password"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr "Scegli una password per il collegamento pubblico"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Consenti caricamento pubblico"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Invia collegamento via email"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Invia"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Imposta data di scadenza"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Data di scadenza"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Condividi tramite email:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Non sono state trovate altre persone"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "gruppo"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "La ri-condivisione non è consentita"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Condiviso in {item} con {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "notifica tramite email"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "può modificare"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "controllo d'accesso"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "aggiornare"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "elimina"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "condividi"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Protetta da password"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Errore durante la rimozione della data di scadenza"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Errore durante l'impostazione della data di scadenza"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Invio in corso..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Messaggio inviato"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Avviso"
 
@@ -671,6 +680,10 @@ msgstr "Per informazioni su come configurare correttamente il tuo server, vedi l
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>account amministratore</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Password"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Archiviazione e database"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 7739fdf5a5..fcbdc9d7c3 100644
--- a/l10n/it/files.po
+++ b/l10n/it/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 16:06+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 12:54+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"
@@ -30,7 +30,7 @@ msgstr "Impossibile spostare %s - un file con questo nome esiste già"
 msgid "Could not move %s"
 msgstr "Impossibile spostare %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Il nome del file non può essere vuoto."
 
@@ -39,18 +39,18 @@ msgstr "Il nome del file non può essere vuoto."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" non è un nome file valido."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "La cartella di destinazione è stata spostata o eliminata."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -142,28 +142,32 @@ msgstr "Caricamento non riuscito. Impossibile ottenere informazioni sul file."
 msgid "Invalid directory."
 msgstr "Cartella non valida."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "File"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Tutti i file"
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte."
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "La dimensione totale del file {size1} supera il limite di caricamento {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 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:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Invio annullato"
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Impossibile ottenere il risultato dal server."
 
@@ -176,131 +180,135 @@ msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il ca
 msgid "URL cannot be empty"
 msgstr "L'URL non può essere vuoto."
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} esiste già"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Impossibile creare il file"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Impossibile creare la cartella"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Errore durante il recupero dello URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Condividi"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Elimina definitivamente"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Rinomina"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Errore durante lo spostamento del file"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Errore"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "In corso"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Errore durante lo spostamento del file."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Errore durante lo spostamento del file"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Errore"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Impossibile rinominare il file"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Errore durante l'eliminazione del file."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nome"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Dimensione"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Modificato"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n cartella"
 msgstr[1] "%n cartelle"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n file"
 msgstr[1] "%n file"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} e {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Caricamento di %n file in corso"
 msgstr[1] "Caricamento di %n file in corso"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" non è un nome file valido."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso"
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Chiave privata non valida per l'applicazione di cifratura. Aggiorna la password della chiave privata nelle impostazioni personali per ripristinare l'accesso ai tuoi file cifrati."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} e {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nome"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Dimensione"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Modificato"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s non può essere rinominato"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Carica (massimo %s)"
@@ -337,68 +345,75 @@ msgstr "Dimensione massima per i file ZIP"
 msgid "Save"
 msgstr "Salva"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Nuovo"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Nuovo file di testo"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "File di testo"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Cartella"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Da collegamento"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "File eliminati"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Annulla invio"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Non c'è niente qui. Carica qualcosa!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Elimina"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Caricamento troppo grande"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Scansione dei file in corso, attendi"
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Scansione corrente"
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index 652c7841ce..5bc1297870 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-11 01:54-0400\n"
-"PO-Revision-Date: 2014-04-10 22:40+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 07:24+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,6 +21,166 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Locale"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Posizione"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Chiave"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Segreto"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr "Bucket"
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr "Amazon S3 e conformi"
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "Chiave di accesso"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Chiave segreta"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "Nome host (opzionale)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Porta (opzionale)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Regione (opzionale)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Abilita SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr "Abilita stile percorsi"
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "Chiave applicazione"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr "Segreto applicazione"
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Nome utente"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Password"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Radice"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "Sicuro ftps://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "ID client"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr "Segreto del client"
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr "OpenStack Object Storage"
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Nome utente (richiesto)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr "Bucket (richiesto)"
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr "Regione (facoltativa per OpenStack Object Storage)"
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr "Chiave API (richiesta per Rackspace Cloud Files)"
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr "Nome tenant (richiesto per OpenStack Object Storage)"
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr "Password (richiesta per OpenStack Object Storage)"
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr "Nome servizio (richiesta per OpenStack Object Storage)"
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr "URL del servizio di identità (richiesto per OpenStack Object Storage)"
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr "Tempo massimo in secondi delle richieste HTTP (opzionale)"
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Condividi"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr "SMB / CIFS utilizzando le credenziali di OC"
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr "Nome utente come condivisione"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "Sicuro https://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "Sottocartella remota"
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Accesso consentito"
@@ -45,29 +205,29 @@ msgstr "Errore durante la configurazione dell'archivio Google Drive"
 msgid "Saved"
 msgstr "Salvato"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Nota:</b>"
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr "e"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 "<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:626
+#: lib/config.php:623
 #, 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 "<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:628
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index 98a37b856b..35015cf3ae 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Condiviso da {owner}"
 
@@ -59,16 +59,15 @@ msgstr "la condivisione è disabilitata"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "condiviso da %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Scarica"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Scarica %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Collegamento diretto"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index e299050c81..6e4e510c54 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Impossibile eliminare %s definitivamente"
 msgid "Couldn't restore %s"
 msgstr "Impossibile ripristinare %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "File eliminati"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Errore"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "File eliminati"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "ripristinati"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Qui non c'è niente. Il tuo cestino è vuoto."
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nome"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Ripristina"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Errore"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "ripristinati"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Qui non c'è niente. Il tuo cestino è vuoto."
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nome"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Eliminati"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Elimina"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 0c4e375bad..432e696434 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 16:10+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 12:54+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,13 +21,16 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Stai accedendo al server da un dominio non affidabile."
 
-#: base.php:724
-msgid "Please contact your administrator"
-msgstr "Contatta il tuo amministratore"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr "Contatta il tuo amministratore di sistema. Se sei un amministratore, configura l'impostazione \"trusted_domain\" in config/config.php. Un esempio di configurazione è disponibile in config/config.sample.php."
 
 #: private/app.php:236
 #, php-format
@@ -77,23 +80,23 @@ msgstr "Immagine non valida"
 msgid "web services under your control"
 msgstr "servizi web nelle tue mani"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Lo scaricamento in formato ZIP è stato disabilitato."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "I file devono essere scaricati uno alla volta."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Torna ai file"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "I  file selezionati sono troppo grandi per generare un file zip."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -279,19 +282,19 @@ msgstr "Imposta un nome utente di amministrazione."
 msgid "Set an admin password."
 msgstr "Imposta una password di amministrazione."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s ha condiviso «%s» con te"
@@ -333,73 +336,79 @@ msgstr "Condivisione di %s non riuscita, poiché il gruppo %s non esiste"
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Condivisione di %s non riuscita, poiché %s non appartiene al gruppo %s"
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Devi fornire una password per creare un collegamento pubblico, sono consentiti solo i collegamenti protetti"
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Condivisione di %s non riuscita, poiché i collegamenti non sono consentiti"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Il tipo di condivisione %s non è valido per %s"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Impostazione permessi per %s non riuscita, poiché i permessi superano i permessi accordati a %s"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Impostazione permessi per %s non riuscita, poiché l'elemento non è stato trovato"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Il motore di condivisione %s deve implementare l'interfaccia OCP\\Share_Backend"
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Motore di condivisione %s non trovato"
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Motore di condivisione di %s non trovato"
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Condivisione di %s non riuscita, poiché l'utente %s l'ha condiviso precedentemente"
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Condivisione di %s non riuscita, poiché i permessi superano quelli accordati a %s"
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Condivisione di %s non riuscita, poiché la ri-condivisione non è consentita"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Condivisione di %s non riuscita, poiché il motore di condivisione per %s non riesce a trovare la sua fonte"
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr "Condivisione di %s non riuscita, poiché il file non è stato trovato nella cache"
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Impossibile trovare la categoria \"%s\""
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 8b92592034..69b8f0a049 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Modalità di invio"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Cifratura"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Metodo di autenticazione"
 
@@ -102,6 +102,16 @@ msgstr "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chie
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Impossibile decifrare i tuoi file, controlla la password e prova ancora"
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Chiavi di cifratura eliminate definitivamente"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Impossibile eliminare definitivamente le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore"
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Email salvata"
@@ -118,6 +128,16 @@ msgstr "Impossibile eliminare il gruppo"
 msgid "Unable to delete user"
 msgstr "Impossibile eliminare l'utente"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Copie di sicurezza ripristinate correttamente"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Impossibile ripristinare le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore"
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Lingua modificata"
@@ -173,7 +193,7 @@ msgstr "Il motore non supporta la modifica della password, ma la chiave di cifra
 msgid "Unable to change password"
 msgstr "Impossibile cambiare la password"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Invio in corso..."
 
@@ -229,34 +249,42 @@ msgstr "Aggiorna"
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Seleziona un'immagine del profilo"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Password molto debole"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Password debole"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Password così-così"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Password buona"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Password forte"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Elimina definitivamente le chiavi di cifratura."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Ripristina le chiavi di cifratura."
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "eliminati"
@@ -302,7 +330,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Italiano"
 
@@ -490,148 +518,143 @@ msgstr "Consenti alle applicazioni di utilizzare le API di condivisione"
 msgid "Allow links"
 msgstr "Consenti collegamenti"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr "Imponi la protezione con password"
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Consenti caricamenti pubblici"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Consenti la ri-condivisione"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Consenti agli utenti di condividere con chiunque"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Consenti le notifiche tramite posta elettronica"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Consenti agli utenti di inviare email di notifica per i file condivisi"
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
-msgstr ""
+msgstr "Imposta data di scadenza predefinita"
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr "Scadenza dopo"
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr "giorni"
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
-msgstr ""
+msgstr "Forza la data di scadenza"
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Consenti la ri-condivisione"
+
+#: templates/admin.php:253
+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:260
+msgid "Allow users to share with anyone"
+msgstr "Consenti agli utenti di condividere con chiunque"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
-msgstr "Le condivisioni scadono in modo predefinito dopo N giorni"
+msgid "Allow mail notification"
+msgstr "Consenti le notifiche tramite posta elettronica"
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr "Consenti agli utenti di inviare email di notifica per i file condivisi"
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Protezione"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Forza HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "Server di posta"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Viene utilizzato per inviare le notifiche."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Indirizzo mittente"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Autenticazione richiesta"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Indirizzo del server"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Porta"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Credenziali"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "Nome utente SMTP"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "Password SMTP"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Prova impostazioni email"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Invia email"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Livello di log"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Altro"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Meno"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versione"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -784,29 +807,33 @@ msgstr "Lingua"
 msgid "Help translate"
 msgstr "Migliora la traduzione"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Password di accesso"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Decifra tutti i file"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Le tue chiavi di cifratura sono state spostate in una posizione sicura. Se qualcosa non dovesse funzionare, potrai ripristinare le chiavi. Eliminale definitivamente solo se sei sicuro che tutti i file siano stati decifrati."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Ripristina chiavi di cifratura"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Elimina chiavi di cifratura"
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Nome utente"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 7cbe7e5ee7..f5f57c0931 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -89,65 +89,65 @@ msgstr "Riuscito"
 msgid "Error"
 msgstr "Errore"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configurazione corretta"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Configurazione non corretta"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Configurazione incompleta"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Seleziona i gruppi"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Seleziona le classi di oggetti"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Seleziona gli attributi"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Prova di connessione riuscita"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Prova di connessione non riuscita"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Vuoi davvero eliminare la configurazione attuale del server?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Conferma l'eliminazione"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s gruppo trovato"
 msgstr[1] "%s gruppi trovati"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s utente trovato"
 msgstr[1] "%s utenti trovati"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Host non valido"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Impossibile trovare la funzionalità desiderata"
 
diff --git a/l10n/ja/core.po b/l10n/ja/core.po
index 18f71bf614..01dd0138e9 100644
--- a/l10n/ja/core.po
+++ b/l10n/ja/core.po
@@ -8,13 +8,14 @@
 # iLikeIT <dj_dark_junglist@yahoo.com>, 2013
 # Koichi MATSUMOTO <mzch@me.com>, 2013
 # kuromabo <md81bird@hitaki.net>, 2014
+# mikako, 2014
 # tt yn <tetuyano+transi@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -64,202 +65,202 @@ msgstr "一時的なプロファイル用画像が利用できません。もう
 msgid "No crop data provided"
 msgstr "クロップデータは提供されません"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "日"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "月"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "火"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "水"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "木"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "金"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "土"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "1月"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "2月"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "3月"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "4月"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "5月"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "6月"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "7月"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "8月"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "9月"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "10月"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "11月"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "12月"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "保存中..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "数秒前"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分前"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 時間前"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n日前"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "1ヶ月前"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%nヶ月前"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "1年前"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "数年前"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "選択"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "ファイル選択テンプレートの読み込みエラー: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "はい"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "いいえ"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "選択"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "ファイル選択テンプレートの読み込みエラー: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "OK"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "メッセージテンプレートの読み込みエラー: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} ファイルが競合"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "1ファイルが競合"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "新しいファイル"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
-msgstr ""
+msgstr "ファイルがすでに存在します"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "どちらのファイルを保持したいですか？"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。"
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "続ける"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(全て選択)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} 選択)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "既存ファイルのテンプレートの読み込みエラー"
 
@@ -291,12 +292,12 @@ msgstr "共有中"
 msgid "Share"
 msgstr "共有"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "エラー"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "共有でエラー発生"
 
@@ -324,107 +325,116 @@ msgstr "ユーザーもしくはグループと共有 ..."
 msgid "Share link"
 msgstr "URLで共有"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "パスワード保護"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "パスワード"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "アップロードを許可"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "メールリンク"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "送信"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "有効期限を設定"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "有効期限"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "メール経由で共有:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "ユーザーが見つかりません"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "グループ"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "再共有は許可されていません"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "{item} 内で {user} と共有中"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "共有解除"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "メールで通知"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "編集を許可"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "アクセス権限"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "作成"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "アップデート"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "削除"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "共有"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "パスワード保護"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "有効期限の未設定エラー"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "有効期限の設定でエラー発生"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "送信中..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "メールを送信しました"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "警告"
 
@@ -668,6 +678,10 @@ msgstr "サーバーを適正に設定する情報は、こちらの<a href=\"%s
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>管理者アカウント</strong>を作成してください"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "パスワード"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "ストレージとデータベース"
diff --git a/l10n/ja/files.po b/l10n/ja/files.po
index 8b53c80c95..61fdc0fbcd 100644
--- a/l10n/ja/files.po
+++ b/l10n/ja/files.po
@@ -8,14 +8,15 @@
 # iLikeIT <dj_dark_junglist@yahoo.com>, 2013
 # Koichi MATSUMOTO <mzch@me.com>, 2013
 # kuromabo <md81bird@hitaki.net>, 2014
+# mikako, 2014
 # pabook <pabook.32@gmail.com>, 2013
 # tt yn <tetuyano+transi@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -34,7 +35,7 @@ msgstr "%s を移動できませんでした ― この名前のファイルは
 msgid "Could not move %s"
 msgstr "%s を移動できませんでした"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "ファイル名を空にすることはできません。"
 
@@ -43,18 +44,18 @@ msgstr "ファイル名を空にすることはできません。"
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" は無効なファイル名です。"
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。"
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "目標のフォルダは移動されたか、削除されました。"
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -146,28 +147,32 @@ msgstr "アップロードに失敗。ファイル情報を取得できません
 msgid "Invalid directory."
 msgstr "無効なディレクトリです。"
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "ファイル"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "ディレクトリもしくは0バイトのため {filename} をアップロードできません"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。"
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "アップロードはキャンセルされました。"
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "サーバーから結果を取得できませんでした。"
 
@@ -180,131 +185,135 @@ msgstr "ファイル転送を実行中です。今このページから移動す
 msgid "URL cannot be empty"
 msgstr "URL は空にできません"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} はすでに存在します"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "ファイルを作成できませんでした"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "フォルダーを作成できませんでした"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "URL取得エラー"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "共有"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "完全に削除する"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "名前の変更"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "ファイルの移動エラー"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "エラー"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "中断"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "ファイル移動でエラー"
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "ファイルの移動エラー"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "エラー"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "ファイルの名前変更ができませんでした"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "ファイルの削除エラー。"
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "名前"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "サイズ"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "更新日時"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 個のフォルダー"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n 個のファイル"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} と {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n 個のファイルをアップロード中"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" は無効なファイル名です。"
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "ストレージがほぼ一杯です（{usedSpacePercent}%）"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください"
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。"
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
-msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。"
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} と {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "名前"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "サイズ"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "更新日時"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%sの名前を変更できませんでした"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
-msgstr ""
+msgstr "アップロード ( 最大 %s )"
 
 #: templates/admin.php:4
 msgid "File handling"
@@ -338,68 +347,75 @@ msgstr "ZIPファイルでの最大入力サイズ"
 msgid "Save"
 msgstr "保存"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "新規作成"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "新規のテキストファイル作成"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "テキストファイル"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "新しいフォルダー"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "フォルダー"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "リンク"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "ゴミ箱"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "アップロードをキャンセル"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr "ここにファイルをアップロードもしくは作成する権限がありません"
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "ここには何もありません。何かアップロードしてください。"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "削除"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "アップロードには大きすぎます。"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。"
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "ファイルをスキャンしています、しばらくお待ちください。"
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "スキャン中"
diff --git a/l10n/ja/files_external.po b/l10n/ja/files_external.po
index dbce411329..ee254592ea 100644
--- a/l10n/ja/files_external.po
+++ b/l10n/ja/files_external.po
@@ -10,8 +10,8 @@ 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"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -20,6 +20,166 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "ローカル"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "位置"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "キー"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "シークレットキー"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr "バケット名"
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr "Amazon S3 と互換ストレージ"
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "アクセスキー"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "シークレットキー"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "ホスト名 (オプション)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "ポート (オプション)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "リージョン (オプション)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "SSLを有効"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr "パス形式を有効"
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "アプリキー"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr "アプリシークレット"
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "ホスト"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "ユーザー名"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "パスワード"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "ルート"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "Secure ftps://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "クライアントID"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr "クライアント秘密キー"
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr "OpenStack Object Storage"
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "ユーザー名 (必須)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr "バケット (必須)"
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr "リージョン (OpenStack Object Storage用のオプション)"
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr "APIキー (Rackspace Cloud Filesに必須)"
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr "テナント名 (OpenStack Object Storage用に必要)"
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr "パスワード (OpenStack Object Storage用に必要)"
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr "サービス名 (OpenStack Object Storage用に必要)"
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr "識別用エンドポイントURL (OpenStack Object Storage用に必要)"
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr "HTTPリクエストのタイムアウト秒数 (オプション)"
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "共有"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr "owncloudログインで SMB/CIFSを使用"
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr "共有名"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "セキュア https://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "リモートサブフォルダ"
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "アクセスは許可されました"
@@ -44,34 +204,34 @@ msgstr "Googleドライブストレージの設定エラー"
 msgid "Saved"
 msgstr "保存されました"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>注意:</b> "
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
-msgstr ""
+msgstr "と"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 ""
+msgstr "<b>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。"
 
-#: lib/config.php:626
+#: lib/config.php:623
 #, 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 ""
+msgstr "<b>注意:</b> PHPにFTPのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。"
 
-#: lib/config.php:628
+#: lib/config.php:625
 #, 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 ""
+msgstr "<b>注意:</b> \"%s\" がインストールされていません。%sをマウントできません。このシステムの管理者にインストールをお願いしてください。"
 
 #: templates/settings.php:2
 msgid "External Storage"
@@ -95,7 +255,7 @@ msgstr "オプション"
 
 #: templates/settings.php:12
 msgid "Available for"
-msgstr ""
+msgstr "以下が利用可能"
 
 #: templates/settings.php:32
 msgid "Add storage"
diff --git a/l10n/ja/files_sharing.po b/l10n/ja/files_sharing.po
index a261938104..86e2d6ad34 100644
--- a/l10n/ja/files_sharing.po
+++ b/l10n/ja/files_sharing.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "{owner} と共有中"
 
@@ -60,16 +60,15 @@ msgstr "共有が無効になっています"
 msgid "For more info, please ask the person who sent this link."
 msgstr "不明な点は、こちらのリンクの提供者に確認をお願いします。"
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "%s で共有中"
+#: templates/public.php:21
+msgid "Download"
+msgstr "ダウンロード"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "%s をダウンロード"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "リンク"
diff --git a/l10n/ja/files_trashbin.po b/l10n/ja/files_trashbin.po
index ec59ca1ef8..567e29f958 100644
--- a/l10n/ja/files_trashbin.po
+++ b/l10n/ja/files_trashbin.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -31,38 +31,34 @@ msgstr "%s を完全に削除できませんでした"
 msgid "Couldn't restore %s"
 msgstr "%s を復元できませんでした"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "名前"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "復元"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "エラー"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "復元済"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "ここには何もありません。ゴミ箱は空です！"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "名前"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "削除済み"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "削除"
diff --git a/l10n/ja/lib.po b/l10n/ja/lib.po
index b5739f97c5..bc580e4965 100644
--- a/l10n/ja/lib.po
+++ b/l10n/ja/lib.po
@@ -7,13 +7,14 @@
 # plazmism <gomidori@live.jp>, 2013-2014
 # Koichi MATSUMOTO <mzch@me.com>, 2013
 # kuromabo <md81bird@hitaki.net>, 2014
-# tt yn <tetuyano+transi@gmail.com>, 2013
+# mikako, 2014
+# tt yn <tetuyano+transi@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -22,13 +23,16 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
-msgstr ""
+msgstr "あなたはサーバに、信用が付与されていないドメインからアクセスしています。"
 
-#: base.php:724
-msgid "Please contact your administrator"
-msgstr ""
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr "管理者に連絡してください。このサーバーの管理者の場合は、\"trusted_domain\" の設定を config/config.php に設定してください。config/config.sample.php にサンプルの設定方法が記載してあります。"
 
 #: private/app.php:236
 #, php-format
@@ -78,23 +82,23 @@ msgstr "無効な画像"
 msgid "web services under your control"
 msgstr "管理下のウェブサービス"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIPダウンロードは無効です。"
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "ファイルは1つずつダウンロードする必要があります。"
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "ファイルに戻る"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "選択したファイルはZIPファイルの生成には大きすぎます。"
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -280,19 +284,19 @@ msgstr "管理者のユーザー名を設定"
 msgid "Set an admin password."
 msgstr "管理者のパスワードを設定。"
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "<a href='%s'>インストールガイド</a>をよく確認してください。"
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%sが あなたと »%s«を共有しました"
@@ -300,107 +304,113 @@ msgstr "%sが あなたと »%s«を共有しました"
 #: private/share/share.php:498
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
+msgstr "%s の共有に失敗しました。そのようなファイルは存在しないからです。"
 
 #: private/share/share.php:523
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
-msgstr ""
+msgstr "%s の共有に失敗しました。ユーザー %s がアイテム所有者です。"
 
 #: private/share/share.php:529
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
-msgstr ""
+msgstr "%s の共有に失敗しました。ユーザー %s が存在しません。"
 
 #: private/share/share.php:538
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
-msgstr ""
+msgstr "%s の共有に失敗しました。ユーザー %s はどのグループにも属していません。%s は、??のメンバーです。"
 
 #: private/share/share.php:551 private/share/share.php:579
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
-msgstr ""
+msgstr "%s の共有に失敗しました。このアイテムは既に %s で共有されています。"
 
 #: private/share/share.php:559
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
-msgstr ""
+msgstr "%s の共有に失敗しました。グループ %s は存在しません。"
 
 #: private/share/share.php:566
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr "%s の共有に失敗しました。%s は、グループ %s のメンバーではありません。"
+
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
-msgstr ""
+msgstr "%s の共有に失敗しました。リンクでの共有は許可されていません。"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
-msgstr ""
+msgstr "%s の共有方法は、%s には適用できません。"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
-msgstr ""
+msgstr "%s の権限設定に失敗しました。%s に許可されている権限を越えています。"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
-msgstr ""
+msgstr "%s の権限設定に失敗しました。アイテムが存在しません。"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
-msgstr ""
+msgstr "%s のバックエンドの共有には、OCP\\Share_Backend　インターフェースを実装しなければなりません。"
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
-msgstr ""
+msgstr "共有バックエンド %s が見つかりません"
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
-msgstr ""
+msgstr "%s のための共有バックエンドが見つかりません"
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
-msgstr ""
+msgstr "%s の共有に失敗しました。ユーザ %s が元々の共有者であるからです。"
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
-msgstr ""
+msgstr "%s の共有に失敗しました。%s に付与されている許可を超えているからです。"
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
-msgstr ""
+msgstr "%s の共有に失敗しました。再共有が許されていないからです。"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
-msgstr ""
+msgstr "%s の共有に失敗しました。%s のバックエンド共有に必要なソースが見つかりませんでした。"
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
-msgstr ""
+msgstr "%s の共有に失敗しました。ファイルキャッシュにファイルがありませんでした。"
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "カテゴリ \"%s\" が見つかりませんでした"
@@ -453,7 +463,7 @@ msgstr "年前"
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "ユーザー名で利用できる文字列は、次のものです： \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\""
 
 #: private/user/manager.php:237
 msgid "A valid username must be provided"
diff --git a/l10n/ja/settings.po b/l10n/ja/settings.po
index 6ed86fb007..27bb04f09a 100644
--- a/l10n/ja/settings.po
+++ b/l10n/ja/settings.po
@@ -7,13 +7,14 @@
 # plazmism <gomidori@live.jp>, 2013-2014
 # iLikeIT <dj_dark_junglist@yahoo.com>, 2013
 # kuromabo <md81bird@hitaki.net>, 2014
+# mikako, 2014
 # tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -52,15 +53,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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "送信モード"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "暗号化"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "認証方法"
 
@@ -91,17 +92,27 @@ msgstr "グループを追加できません"
 
 #: ajax/decryptall.php:31
 msgid "Files decrypted successfully"
-msgstr ""
+msgstr "ファイルの復号化に成功しました"
 
 #: ajax/decryptall.php:33
 msgid ""
 "Couldn't decrypt your files, please check your owncloud.log or ask your "
 "administrator"
-msgstr ""
+msgstr "ファイルを復号化することができませんでした。owncloud のログを調査するか、管理者に連絡してください。"
 
 #: ajax/decryptall.php:36
 msgid "Couldn't decrypt your files, check your password and try again"
-msgstr ""
+msgstr "ファイルを復号化することができませんでした。パスワードを確認のうえ再試行してください。"
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "暗号化キーは完全に削除されます"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "暗号化キーを完全に削除できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。"
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
@@ -119,6 +130,16 @@ msgstr "グループを削除できません"
 msgid "Unable to delete user"
 msgstr "ユーザーを削除できません"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "バックアップの復元に成功しました"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "暗号化キーを復元できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。"
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "言語が変更されました"
@@ -174,7 +195,7 @@ msgstr "バックエンドはパスワード変更をサポートしていませ
 msgid "Unable to change password"
 msgstr "パスワードを変更できません"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "送信中…"
 
@@ -230,34 +251,42 @@ msgstr "アップデート"
 msgid "Updated"
 msgstr "アップデート済み"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "プロファイル画像を選択"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "非常に弱いパスワード"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "弱いパスワード"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "まずまずのパスワード"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "良好なパスワード"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "強いパスワード"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。"
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "削除"
@@ -303,7 +332,7 @@ msgstr "有効なパスワードを指定する必要があります"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します"
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Japanese (日本語)"
 
@@ -448,18 +477,18 @@ msgstr "Cron"
 #: templates/admin.php:167
 #, php-format
 msgid "Last cron was executed at %s."
-msgstr ""
+msgstr "直近では %s に cron が実行されました。"
 
 #: templates/admin.php:170
 #, php-format
 msgid ""
 "Last cron was executed at %s. This is more than an hour ago, something seems"
 " wrong."
-msgstr ""
+msgstr "直近では %s に cron が実行されました。これは今から１時間以上前なので、なんらかの問題が発生しているようです。"
 
 #: templates/admin.php:174
 msgid "Cron was not executed yet!"
-msgstr ""
+msgstr "cron は未だ実行されていません！"
 
 #: templates/admin.php:184
 msgid "Execute one task with each page loaded"
@@ -491,148 +520,143 @@ msgstr "アプリからの共有APIの利用を許可する"
 msgid "Allow links"
 msgstr "リンクを許可する"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "ユーザーがリンクによりアイテムを公開することを許可する"
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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:230
+msgid "Set default expiration date"
+msgstr "有効期限の既定値を設定"
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr "無効になるまで"
 
 #: templates/admin.php:235
+msgid "days"
+msgstr "日"
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr "有効期限を反映させる"
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "ユーザーがリンクによりアイテムを公開することを許可する"
+
+#: templates/admin.php:252
 msgid "Allow resharing"
 msgstr "再共有を許可する"
 
-#: templates/admin.php:236
+#: templates/admin.php:253
 msgid "Allow users to share items shared with them again"
 msgstr "ユーザーが共有しているアイテムの再共有を許可する"
 
-#: templates/admin.php:243
+#: templates/admin.php:260
 msgid "Allow users to share with anyone"
 msgstr "ユーザーに誰とでも共有することを許可する"
 
-#: templates/admin.php:246
+#: templates/admin.php:263
 msgid "Allow users to only share with users in their groups"
 msgstr "ユーザーにグループ内のユーザーとのみ共有を許可する"
 
-#: templates/admin.php:253
+#: templates/admin.php:270
 msgid "Allow mail notification"
 msgstr "メール通知を許可"
 
-#: templates/admin.php:254
+#: templates/admin.php:271
 msgid "Allow users to send mail notification for shared files"
-msgstr ""
+msgstr "共有ファイルに関するメール通知の送信をユーザに許可する"
 
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
-
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "セキュリティ"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "常にHTTPSを使用する"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "クライアントから %sへの接続を常に暗号化します。"
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。"
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "メールサーバー"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "これは通知の送信に使われます。"
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "アドレスから"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "要求される認証"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "サーバーアドレス"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "ポート"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "資格情報"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "SMTP ユーザー名"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "SMTP パスワード"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "メールテスト設定"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "メールを送信"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "ログ"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "ログレベル"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "もっと見る"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "閉じる"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "バージョン"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -785,29 +809,33 @@ msgstr "言語"
 msgid "Help translate"
 msgstr "翻訳に協力する"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください"
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "ログインパスワード"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "すべてのファイルを複合する"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "暗号化キーはバックアップ場所に移動されました。何か問題があった場合は、キーを復元することができます。すべてのファイルが正しく復号化されたことが確信できる場合にのみ、キーを完全に削除してください。"
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "暗号化キーを復元する"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "暗号化キーを削除する"
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "ログイン名"
diff --git a/l10n/ja/user_ldap.po b/l10n/ja/user_ldap.po
index c590548a9f..70d3fda26b 100644
--- a/l10n/ja/user_ldap.po
+++ b/l10n/ja/user_ldap.po
@@ -6,14 +6,15 @@
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
 # plazmism <gomidori@live.jp>, 2013-2014
 # kuromabo <md81bird@hitaki.net>, 2014
-# tt yn <tetuyano+transi@gmail.com>, 2013
+# mikako, 2014
+# tt yn <tetuyano+transi@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,63 +91,63 @@ msgstr "成功"
 msgid "Error"
 msgstr "エラー"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "設定OK"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "設定に誤りがあります"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "設定が不完全です"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "グループを選択"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "オブジェクトクラスを選択"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "属性を選択"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "接続テストに成功しました"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "接続テストに失敗しました"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "現在のサーバー設定を本当に削除してもよろしいですか？"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "削除の確認"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s グループが見つかりました"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s ユーザーが見つかりました"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "無効なホスト"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "望ましい機能は見つかりませんでした"
 
@@ -338,7 +339,7 @@ msgstr "レプリカサーバーにのみ接続します。"
 
 #: templates/settings.php:26
 msgid "Case insensitive LDAP server (Windows)"
-msgstr ""
+msgstr "大文字と小文字を区別しない LDAP サーバ (Windows)"
 
 #: templates/settings.php:27
 msgid "Turn off SSL certificate validation."
@@ -423,14 +424,14 @@ msgstr "オンに切り替えたら、グループを含むグループがサポ
 
 #: templates/settings.php:40
 msgid "Paging chunksize"
-msgstr ""
+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 ""
+msgstr "ページ分割サイズは、LDAP検索時にユーザーやグループのリスト一覧データを一括で返すデータ量を指定します。(設定が0の場合には、LDAP検索の分割転送は無効)"
 
 #: templates/settings.php:42
 msgid "Special Attributes"
diff --git a/l10n/jv/core.po b/l10n/jv/core.po
index 64f25812fd..b42d54cf4c 100644
--- a/l10n/jv/core.po
+++ b/l10n/jv/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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/jv/files.po b/l10n/jv/files.po
index 49027add41..fecd7859b1 100644
--- a/l10n/jv/files.po
+++ b/l10n/jv/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Njipuk"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/jv/files_external.po b/l10n/jv/files_external.po
index 86d3c6e3eb..586984979d 100644
--- a/l10n/jv/files_external.po
+++ b/l10n/jv/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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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"
@@ -17,6 +17,166 @@ msgstr ""
 "Language: jv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Papan panggonan"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/jv/files_sharing.po b/l10n/jv/files_sharing.po
index 9fedbf7af1..1b1b9c3509 100644
--- a/l10n/jv/files_sharing.po
+++ b/l10n/jv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-08 01:56-0400\n"
-"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"POT-Creation-Date: 2014-05-04 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 06:12+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"
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Njipuk"
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/jv/files_trashbin.po b/l10n/jv/files_trashbin.po
index be9965732a..b39c943187 100644
--- a/l10n/jv/files_trashbin.po
+++ b/l10n/jv/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-08 01:56-0400\n"
-"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,23 +27,23 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
@@ -51,10 +51,6 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:21 templates/index.php:23
-msgid "Restore"
-msgstr ""
-
 #: templates/index.php:29
 msgid "Deleted"
 msgstr ""
diff --git a/l10n/jv/lib.po b/l10n/jv/lib.po
index 353c66e7ba..7eaa7cebce 100644
--- a/l10n/jv/lib.po
+++ b/l10n/jv/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -17,12 +17,15 @@ msgstr ""
 "Language: jv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/jv/settings.po b/l10n/jv/settings.po
index b110d3bb88..6cbf531122 100644
--- a/l10n/jv/settings.po
+++ b/l10n/jv/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 41fcdca0f5..6e75d0058d 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,202 +58,202 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "კვირა"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "ორშაბათი"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "სამშაბათი"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "ოთხშაბათი"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "ხუთშაბათი"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "პარასკევი"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "შაბათი"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "იანვარი"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "თებერვალი"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "მარტი"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "აპრილი"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "მაისი"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "ივნისი"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "ივლისი"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "აგვისტო"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "სექტემბერი"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "ოქტომბერი"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "ნოემბერი"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "დეკემბერი"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "პარამეტრები"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "შენახვა..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "წამის წინ"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "დღეს"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "გასულ თვეში"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "ბოლო წელს"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "წლის წინ"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "არჩევა"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "კი"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "არა"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "არჩევა"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "დიახ"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "ახალი ფაილები"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "უარყოფა"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -285,12 +285,12 @@ msgstr "გაზიარებული"
 msgid "Share"
 msgstr "გაზიარება"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "შეცდომა"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "შეცდომა გაზიარების დროს"
 
@@ -318,107 +318,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "პაროლით დაცვა"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "პაროლი"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "ლინკის პიროვნების იმეილზე გაგზავნა"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "გაგზავნა"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "მიუთითე ვადის გასვლის დრო"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "ვადის გასვლის დრო"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "გააზიარე მეილზე"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "მომხმარებელი არ არის ნაპოვნი"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "ჯგუფი"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "მეორეჯერ გაზიარება არ არის დაშვებული"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "გაზიარდა {item}–ში  {user}–ის მიერ"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "გაუზიარებადი"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "შეგიძლია შეცვლა"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "დაშვების კონტროლი"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "შექმნა"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "განახლება"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "წაშლა"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "გაზიარება"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "პაროლით დაცული"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "შეცდომა ვადის გასვლის მოხსნის დროს"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "შეცდომა ვადის გასვლის მითითების დროს"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "გაგზავნა ...."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "იმეილი გაიგზავნა"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "გაფრთხილება"
 
@@ -662,6 +671,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "შექმენი <strong>ადმინ ექაუნტი</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "პაროლი"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index aa89d7c7ba..c1da1b32b6 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -27,7 +27,7 @@ msgstr "%s –ის გადატანა ვერ მოხერხდა
 msgid "Could not move %s"
 msgstr "%s –ის გადატანა ვერ მოხერხდა"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "ფაილის სახელი არ შეიძლება იყოს ცარიელი."
 
@@ -36,18 +36,18 @@ msgstr "ფაილის სახელი არ შეიძლება 
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "არადაშვებადი სახელი, '\\', '/', '<', '>', ':', '\"', '|', '?' და  '*' არ არის დაიშვებული."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr "დაუშვებელი დირექტორია."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "ფაილები"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "ატვირთვა შეჩერებულ იქნა."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,128 +177,132 @@ msgstr "მიმდინარეობს ფაილის ატვირ
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} უკვე არსებობს"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "გაზიარება"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "სრულად წაშლა"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "გადარქმევა"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr ""
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის."
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "შეცდომა"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "მოცდის რეჟიმში"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "შეცდომა"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "სახელი"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "ზომა"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "შეცვლილია"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "თქვენი საცავი გადაივსო. ფაილების განახლება და სინქრონიზირება ვერ მოხერხდება!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
-msgstr "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "სახელი"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "ზომა"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "შეცვლილია"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -331,68 +339,75 @@ msgstr "ZIP ფაილების მაქსიმუმ დასაშვ
 msgid "Save"
 msgstr "შენახვა"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "ახალი"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "ტექსტური ფაილი"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "ახალი ფოლდერი"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "საქაღალდე"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "მისამართიდან"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "წაშლილი ფაილები"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "ატვირთვის გაუქმება"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "აქ არაფერი არ არის. ატვირთე რამე!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "ჩამოტვირთვა"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "წაშლა"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "ასატვირთი ფაილი ძალიან დიდია"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს."
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "მიმდინარე სკანირება"
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index 5bb8ccc954..bc0bd6a008 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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,6 +17,166 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "ადგილმდებარეობა"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "ჰოსტი"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "მომხმარებლის სახელი"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "პაროლი"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "გაზიარება"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "დაშვება მინიჭებულია"
@@ -41,29 +201,29 @@ msgstr "შეცდომა Google Drive საცავის კონფი
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index a68d515711..f222243385 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:20+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "გაზიარდა {owner} –ის მიერ"
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "ჩამოტვირთვა"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index c4f96c3539..6058d4077f 100644
--- a/l10n/ka_GE/files_trashbin.po
+++ b/l10n/ka_GE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr "ფაილი %s–ის სრულად წაშლა ვერ
 msgid "Couldn't restore %s"
 msgstr "%s–ის აღდგენა ვერ მოხერხდა"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "სახელი"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "აღდგენა"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "შეცდომა"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "აქ არაფერი არ არის. სანაგვე ყუთი ცარიელია!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "სახელი"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "წაშლილი"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "წაშლა"
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index 1572016e29..0e49ad1751 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP download–ი გათიშულია"
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "ფაილები უნდა გადმოიტვირთოს სათითაოდ."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "უკან ფაილებში"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "არჩეული ფაილები ძალიან დიდია zip ფაილის გენერაციისთვის."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr "დააყენეთ ადმინისტრატორის 
 msgid "Set an admin password."
 msgstr "დააყენეთ ადმინისტრატორის პაროლი."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>."
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "\"%s\" კატეგორიის მოძებნა ვერ მოხერხდა"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index c56746c385..a09f9f0701 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "ენკრიპცია"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -99,6 +99,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "იმეილი შენახულია"
@@ -115,6 +125,16 @@ msgstr "ჯგუფის წაშლა ვერ მოხერხდა"
 msgid "Unable to delete user"
 msgstr "მომხმარებლის წაშლა ვერ მოხერხდა"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "ენა შეცვლილია"
@@ -170,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -226,34 +246,42 @@ msgstr "განახლება"
 msgid "Updated"
 msgstr "განახლებულია"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "წაშლილი"
@@ -299,7 +327,7 @@ msgstr "უნდა მიუთითოთ არსებული პარ
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -487,148 +515,143 @@ msgstr "დაუშვი აპლიკაციების უფლებ
 msgid "Allow links"
 msgstr "ლინკების დაშვება"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "მიეცი მომხმარებლებს უფლება რომ გააზიაროს ელემენტები საჯაროდ ლინკებით"
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "მიეცი მომხმარებლებს უფლება რომ გააზიაროს ელემენტები საჯაროდ ლინკებით"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "გადაზიარების დაშვება"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "მიეცით მომხმარებლებს უფლება რომ გააზიაროს მისთვის გაზიარებული"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "მიეცით უფლება მომხმარებლებს გააზიაროს ყველასთვის"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "მიეცით უფლება მომხმარებლებს რომ გააზიაროს მხოლოდ თავიანთი ჯგუფისთვის"
+
 #: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "უსაფრთხოება"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "HTTPS–ის ჩართვა"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "სერვერის მისამართი"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "პორტი"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "იუზერ/პაროლი"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "ლოგი"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "ლოგირების დონე"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "უფრო მეტი"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "უფრო ნაკლები"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "ვერსია"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +804,33 @@ msgstr "ენა"
 msgid "Help translate"
 msgstr "თარგმნის დახმარება"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "მომხმარებლის სახელი"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index 72f7076dd2..4adae59597 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -86,63 +86,63 @@ msgstr "დასრულდა"
 msgid "Error"
 msgstr "შეცდომა"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "ჯგუფების არჩევა"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "კავშირის ტესტირება მოხერხდა"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "კავშირის ტესტირება ვერ მოხერხდა"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "წაშლის დადასტურება"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/km/core.po b/l10n/km/core.po
index 087b7e596a..cd576a1de0 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -59,224 +59,224 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "ថ្ងៃអាទិត្យ"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "ថ្ងៃចន្ទ"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "ថ្ងៃអង្គារ"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "ថ្ងៃពុធ"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "ថ្ងៃព្រហស្បតិ៍"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "ថ្ងៃសុក្រ"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "ថ្ងៃសៅរ៍"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "ខែមករា"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "ខែកុម្ភៈ"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "ខែមីនា"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "ខែមេសា"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "ខែឧសភា"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "ខែមិថុនា"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "ខែកក្កដា"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "ខែសីហា"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "ខែកញ្ញា"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "ខែតុលា"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "ខែវិច្ឆិកា"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "ខែធ្នូ"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "ការកំណត់"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "កំពុង​រក្សាទុក"
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "វិនាទី​មុន"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n នាទី​មុន"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n ម៉ោង​មុន"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "ថ្ងៃនេះ"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "ម្សិលមិញ"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n ថ្ងៃ​មុន"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "ខែមុន"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n ខែ​មុន"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "ឆ្នាំ​មុន"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "ឆ្នាំ​មុន"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "ជ្រើស"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "ព្រម"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "ទេ"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "ជ្រើស"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "ព្រម"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
-msgstr ""
+msgstr "ឯកសារ​ថ្មី"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
-msgstr ""
+msgstr "មាន​ឯកសារ​នេះ​រួច​ហើយ"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "លើកលែង"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
-msgstr ""
+msgstr "បន្ត"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
-msgstr ""
+msgstr "(បាន​ជ្រើស​ទាំង​អស់)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
-msgstr ""
+msgstr "(បាន​ជ្រើស {count})"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 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"
@@ -286,12 +286,12 @@ msgstr "បាន​ចែក​រំលែក"
 msgid "Share"
 msgstr "ចែក​រំលែក"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "កំហុស"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "កំហុស​ពេល​ចែក​រំលែក"
 
@@ -319,107 +319,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+#: js/share.js:235
+msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr "អនុញ្ញាត​ការ​ផ្ទុកឡើង​ជា​សាធារណៈ"
+
+#: js/share.js:245
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "ផ្ញើ"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "កំណត់​ពេល​ផុត​កំណត់"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "ពេល​ផុត​កំណត់"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "ចែក​រំលែក​តាម​អ៊ីមែល៖"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "រក​មិន​ឃើញ​មនុស្ស​ណា​ម្នាក់"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "ក្រុម"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "មិន​អនុញ្ញាត​ឲ្យ​មាន​ការ​ចែក​រំលែក​ឡើង​វិញ"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "បាន​ចែក​រំលែក​ក្នុង {item} ជាមួយ {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "លែង​ចែក​រំលែក"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "អាច​កែប្រែ"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "សិទ្ធិ​បញ្ជា"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "បង្កើត"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "ធ្វើ​បច្ចុប្បន្នភាព"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "លុប"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "ចែក​រំលែក"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "បាន​ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "កំពុង​ផ្ញើ ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "បាន​ផ្ញើ​អ៊ីមែល"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "បម្រាម"
 
@@ -453,7 +462,7 @@ msgstr ""
 
 #: js/update.js:8
 msgid "Please reload the page."
-msgstr ""
+msgstr "សូម​ផ្ទុក​ទំព័រ​នេះ​ឡើង​វិញ។"
 
 #: js/update.js:17
 msgid ""
@@ -475,7 +484,7 @@ msgstr ""
 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}"
@@ -661,35 +670,39 @@ msgstr ""
 
 #: templates/installation.php:48
 msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "បង្កើត​<strong>គណនី​អភិបាល</strong>"
+
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "ពាក្យសម្ងាត់"
 
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្នន័យ"
 
 #: templates/installation.php:77
 msgid "Data folder"
-msgstr ""
+msgstr "ថត​ទិន្នន័យ"
 
 #: templates/installation.php:90
 msgid "Configure the database"
-msgstr ""
+msgstr "កំណត់​សណ្ឋាន​មូលដ្ឋាន​ទិន្នន័យ"
 
 #: templates/installation.php:94
 msgid "will be used"
-msgstr ""
+msgstr "នឹង​ត្រូវ​បាន​ប្រើ"
 
 #: templates/installation.php:109
 msgid "Database user"
-msgstr ""
+msgstr "អ្នក​ប្រើ​មូលដ្ឋាន​ទិន្នន័យ"
 
 #: templates/installation.php:118
 msgid "Database password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាត់​មូលដ្ឋាន​ទិន្នន័យ"
 
 #: templates/installation.php:123
 msgid "Database name"
-msgstr ""
+msgstr "ឈ្មោះ​មូលដ្ឋាន​ទិន្នន័យ"
 
 #: templates/installation.php:132
 msgid "Database tablespace"
@@ -697,15 +710,15 @@ msgstr ""
 
 #: templates/installation.php:140
 msgid "Database host"
-msgstr ""
+msgstr "ម៉ាស៊ីន​មូលដ្ឋាន​ទិន្នន័យ"
 
 #: templates/installation.php:150
 msgid "Finish setup"
-msgstr ""
+msgstr "បញ្ចប់​ការ​ដំឡើង"
 
 #: templates/installation.php:150
 msgid "Finishing …"
-msgstr ""
+msgstr "កំពុង​បញ្ចប់ ..."
 
 #: templates/layout.user.php:40
 msgid ""
@@ -721,11 +734,11 @@ msgstr ""
 
 #: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
-msgstr ""
+msgstr "ចាក​ចេញ"
 
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "បាន​បដិសេធ​ការ​ចូល​ដោយ​ស្វ័យ​ប្រវត្តិ!"
 
 #: templates/login.php:10
 msgid ""
@@ -735,7 +748,7 @@ msgstr ""
 
 #: templates/login.php:12
 msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "សូម​ប្ដូរ​ពាក្យ​សម្ងាត់​របស់​អ្នក ដើម្បី​ការពារ​គណនី​របស់​អ្នក។"
 
 #: templates/login.php:17
 msgid "Server side authentication failed!"
@@ -747,19 +760,19 @@ msgstr ""
 
 #: templates/login.php:46
 msgid "Lost your password?"
-msgstr ""
+msgstr "បាត់​ពាក្យ​សម្ងាត់​របស់​អ្នក?"
 
 #: templates/login.php:51
 msgid "remember"
-msgstr ""
+msgstr "ចងចាំ"
 
 #: templates/login.php:54
 msgid "Log in"
-msgstr ""
+msgstr "ចូល"
 
 #: templates/login.php:60
 msgid "Alternative Logins"
-msgstr ""
+msgstr "ការ​ចូល​ជំនួស"
 
 #: templates/mail.php:15
 #, php-format
@@ -789,7 +802,7 @@ msgstr ""
 #: templates/update.admin.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "ការ​ធ្វើ​បច្ចុប្បន្នភាព ownCloud ទៅ​កំណែ %s អាច​ចំណាយ​ពេល​មួយ​សំទុះ។"
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/km/files.po b/l10n/km/files.po
index 83d79c5c43..80a21749a9 100644
--- a/l10n/km/files.po
+++ b/l10n/km/files.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# សុវិចិត្រ Sovichet ទេព Tep, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -27,27 +28,27 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
-msgstr ""
+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:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr ""
+msgstr "ឈ្មោះ​មិន​ត្រឹម​ត្រូវ, មិន​អនុញ្ញាត '\\', '/', '<', '>', ':', '\"', '|', '?' និង '*' ទេ។"
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +140,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "ឯកសារ"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
-msgstr ""
+msgstr "បាន​បោះបង់​ការ​ផ្ទុក​ឡើង។"
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,128 +178,132 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
-msgstr ""
+msgstr "មាន​ឈ្មោះ {new_name} រួច​ហើយ"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "ចែក​រំលែក"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
-msgstr ""
+msgstr "លុប​ជា​អចិន្ត្រៃយ៍"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
+msgstr "ប្ដូរ​ឈ្មោះ"
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "ការ​ទាញយក​របស់​អ្នក​កំពុង​ត្រូវ​បាន​រៀបចំ​ហើយ។ នេះ​អាច​ចំណាយ​ពេល​មួយ​សំទុះ ប្រសិន​បើ​ឯកសារ​ធំ។"
+
+#: js/filelist.js:602 js/filelist.js:1672
+msgid "Pending"
+msgstr "កំពុង​រង់ចាំ"
+
+#: js/filelist.js:1127
+msgid "Error moving file."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
+#: js/filelist.js:1135
 msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
+#: js/filelist.js:1135
 msgid "Error"
 msgstr "កំហុស"
 
-#: js/filelist.js:258 js/filelist.js:1141
-msgid "Pending"
-msgstr ""
-
-#: js/filelist.js:624
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "ឈ្មោះ"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "ទំហំ"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "បាន​កែ​ប្រែ"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "ឈ្មោះ"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "ទំហំ"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -305,7 +314,7 @@ msgstr ""
 
 #: templates/admin.php:6
 msgid "Maximum upload size"
-msgstr ""
+msgstr "ទំហំ​ផ្ទុកឡើង​ជា​អតិបរមា"
 
 #: templates/admin.php:9
 msgid "max. possible: "
@@ -317,82 +326,89 @@ msgstr ""
 
 #: templates/admin.php:16
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "បើក​ការ​ទាញយក​ជា ZIP"
 
 #: templates/admin.php:19
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 គឺ​មិន​កំណត់"
 
 #: templates/admin.php:21
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "ទំហំ​ចូល​ជា​អតិបរមា​សម្រាប់​ឯកសារ ZIP"
 
 #: templates/admin.php:25
 msgid "Save"
 msgstr "រក្សាទុក"
 
-#: templates/index.php:5
-msgid "New"
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:5
+msgid "New"
+msgstr "ថ្មី"
+
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
-msgstr ""
+msgstr "ឯកសារ​អក្សរ"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "ថត​ថ្មី"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "ថត"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
-msgstr ""
+msgstr "ពី​តំណ"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
-msgstr ""
+msgstr "បោះបង់​ការ​ផ្ទុកឡើង"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
-msgstr ""
+msgstr "គ្មាន​អ្វី​នៅ​ទីនេះ​ទេ។ ផ្ទុក​ឡើង​អ្វី​មួយ!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "ទាញយក"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "លុប"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
-msgstr ""
+msgstr "ផ្ទុក​ឡើង​ធំ​ពេក"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/km/files_external.po b/l10n/km/files_external.po
index 06a546e4e7..a9cf22d5ce 100644
--- a/l10n/km/files_external.po
+++ b/l10n/km/files_external.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# សុវិចិត្រ Sovichet ទេព Tep, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-14 01:54-0400\n"
-"PO-Revision-Date: 2014-04-13 09:30+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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,17 +18,177 @@ msgstr ""
 "Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "ទីតាំង"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "ម៉ាស៊ីន​ផ្ទុក"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "ឈ្មោះ​អ្នកប្រើ"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "ពាក្យសម្ងាត់"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "ចែក​រំលែក"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
-msgstr ""
+msgstr "បាន​ទទួល​សិទ្ធិ​ចូល"
 
 #: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
-msgstr ""
+msgstr "កំហុស​ការ​កំណត់​សណ្ឋាន​នៃ​ឃ្លាំងផ្ទុក Dropbox"
 
 #: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
-msgstr ""
+msgstr "ទទួល​សិទ្ធិ​ចូល"
 
 #: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
@@ -39,31 +200,31 @@ msgstr ""
 
 #: js/settings.js:318 js/settings.js:325
 msgid "Saved"
-msgstr ""
+msgstr "បាន​រក្សាទុក"
 
-#: lib/config.php:598
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:608
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:630
+#: lib/config.php:621
 #, 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:632
+#: lib/config.php:623
 #, 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:634
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -72,7 +233,7 @@ msgstr ""
 
 #: templates/settings.php:2
 msgid "External Storage"
-msgstr ""
+msgstr "ឃ្លាំងផ្ទុក​ខាងក្រៅ"
 
 #: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
@@ -80,11 +241,11 @@ msgstr "ឈ្មោះ​ថត"
 
 #: templates/settings.php:9
 msgid "External storage"
-msgstr ""
+msgstr "ឃ្លាំងផ្ទុក​ខាងក្រៅ"
 
 #: templates/settings.php:10
 msgid "Configuration"
-msgstr ""
+msgstr "ការ​កំណត់​សណ្ឋាន"
 
 #: templates/settings.php:11
 msgid "Options"
@@ -96,7 +257,7 @@ msgstr ""
 
 #: templates/settings.php:32
 msgid "Add storage"
-msgstr ""
+msgstr "បន្ថែម​ឃ្លាំងផ្ទុក"
 
 #: templates/settings.php:92
 msgid "No user or group"
@@ -104,7 +265,7 @@ msgstr ""
 
 #: templates/settings.php:95
 msgid "All Users"
-msgstr ""
+msgstr "អ្នក​ប្រើ​ទាំងអស់"
 
 #: templates/settings.php:97
 msgid "Groups"
diff --git a/l10n/km/files_sharing.po b/l10n/km/files_sharing.po
index bdcdb1e7e6..1aee8d4372 100644
--- a/l10n/km/files_sharing.po
+++ b/l10n/km/files_sharing.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Pongsametrey SOK <metreysk@gmail.com>, 2014
+# សុវិចិត្រ Sovichet ទេព Tep, 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-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 14:59+0000\n"
+"Last-Translator: សុវិចិត្រ Sovichet ទេព Tep\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,17 +19,17 @@ msgstr ""
 "Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
-msgstr ""
+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"
@@ -36,38 +37,37 @@ 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
-msgid "shared by %s"
-msgstr "បាន​ចែក​រំលែក​ដោយ %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "ទាញយក"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
-msgstr ""
+msgstr "ទាញយក %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
-msgstr ""
+msgstr "តំណ​ផ្ទាល់"
diff --git a/l10n/km/files_trashbin.po b/l10n/km/files_trashbin.po
index a1b7649d1a..b03e1951c8 100644
--- a/l10n/km/files_trashbin.po
+++ b/l10n/km/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# សុវិចិត្រ Sovichet ទេព Tep, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -20,45 +21,41 @@ msgstr ""
 #: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "មិន​អាច​លុប %s ចោល​ជា​អចិន្ត្រៃយ៍​ទេ"
 
 #: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "មិន​អាច​ស្ដារ %s ឡើង​វិញ​បាន​ទេ"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
-msgstr ""
+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:19
-msgid "Name"
-msgstr "ឈ្មោះ"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "ស្ដារ​មក​វិញ"
 
-#: templates/index.php:30
-msgid "Deleted"
-msgstr ""
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "កំហុស"
 
-#: templates/index.php:33 templates/index.php:34
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "បាន​ស្ដារ​វិញ"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "គ្មាន​អ្វី​នៅ​ទីនេះ​ទេ។ ធុង​សំរាម​របស់​អ្នក​គឺ​ទទេ!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "ឈ្មោះ"
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr "បាន​លុប"
+
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "លុប"
diff --git a/l10n/km/lib.po b/l10n/km/lib.po
index 3f0078754b..4777c61a7f 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +18,15 @@ msgstr ""
 "Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -74,23 +77,23 @@ msgstr "រូបភាព​មិន​ត្រឹម​ត្រូវ"
 msgid "web services under your control"
 msgstr "សេវាកម្ម​វេប​ក្រោម​ការ​ការ​បញ្ជា​របស់​អ្នក"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "បាន​បិទ​ការ​ទាញ​យក ZIP ។"
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "ត្រូវ​ការ​ទាញ​យក​ឯកសារ​ម្ដង​មួយៗ។"
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "ត្រឡប់​ទៅ​ឯកសារ"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "ឯកសារ​ដែល​បាន​ជ្រើស មាន​ទំហំ​ធំ​ពេក​ក្នុង​ការ​បង្កើត​ជា zip ។"
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -276,19 +279,19 @@ msgstr "កំណត់​ឈ្មោះ​អ្នក​គ្រប់គ្
 msgid "Set an admin password."
 msgstr "កំណត់​ពាក្យ​សម្ងាត់​អ្នក​គ្រប់គ្រង។"
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -330,73 +333,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "រក​មិន​ឃើញ​ចំណាត់​ក្រុម \"%s\""
diff --git a/l10n/km/settings.po b/l10n/km/settings.po
index ea12daf58a..a7e74439d1 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -26,20 +26,20 @@ msgstr ""
 
 #: 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"
@@ -47,17 +47,17 @@ msgstr "បាន​ផ្ញើ​អ៊ីមែល"
 
 #: admin/controller.php:101
 msgid "You need to set your user email before being able to send test emails."
-msgstr ""
+msgstr "អ្នក​ត្រូវ​តែ​កំណត់​អ៊ីមែល​របស់​អ្នក​មុន​នឹង​អាច​ផ្ញើ​អ៊ីមែល​សាកល្បង​បាន។"
 
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "កូដនីយកម្ម"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -100,6 +100,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "បាន​រក្សា​ទុក​អ៊ីមែល"
@@ -116,6 +126,16 @@ msgstr "មិន​អាច​លុប​ក្រុម​បាន"
 msgid "Unable to delete user"
 msgstr "មិន​អាច​លុប​អ្នក​ប្រើ​បាន"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "បាន​ប្ដូរ​ភាសា"
@@ -144,7 +164,7 @@ msgstr "មិន​អាច​ធ្វើ​បច្ចុប្បន្ន
 
 #: changepassword/controller.php:17
 msgid "Wrong password"
-msgstr ""
+msgstr "ខុស​ពាក្យ​សម្ងាត់"
 
 #: changepassword/controller.php:36
 msgid "No user supplied"
@@ -171,9 +191,9 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
-msgstr ""
+msgstr "កំពុង​ផ្ញើ..."
 
 #: js/apps.js:45 templates/help.php:4
 msgid "User Documentation"
@@ -181,7 +201,7 @@ msgstr "ឯកសារ​សម្រាប់​អ្នក​ប្រើប
 
 #: js/apps.js:50
 msgid "Admin Documentation"
-msgstr ""
+msgstr "កម្រង​ឯកសារ​អភិបាល"
 
 #: js/apps.js:67
 msgid "Update to {appversion}"
@@ -227,32 +247,40 @@ msgstr "ធ្វើ​បច្ចុប្បន្នភាព"
 msgid "Updated"
 msgstr "បាន​ធ្វើ​បច្ចុប្បន្នភាព"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
-msgstr ""
+msgstr "ជ្រើស​រូបភាព​ប្រវត្តិរូប"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាត់​ខ្សោយ​ណាស់"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាត់​ខ្សោយ"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាត់​ធម្មតា"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាត់​ល្អ"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
+msgstr "ពាក្យ​សម្ងាត់​ខ្លាំង"
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
-#: js/personal.js:313
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
 msgstr ""
 
 #: js/users.js:47
@@ -300,7 +328,7 @@ msgstr "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -326,7 +354,7 @@ msgstr ""
 
 #: templates/admin.php:16 templates/admin.php:23
 msgid "None"
-msgstr ""
+msgstr "គ្មាន"
 
 #: templates/admin.php:17
 msgid "Login"
@@ -342,11 +370,11 @@ msgstr ""
 
 #: templates/admin.php:24
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: templates/admin.php:25
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
 #: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
@@ -488,148 +516,143 @@ msgstr "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្
 msgid "Allow links"
 msgstr "អនុញ្ញាត​តំណ"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ចែក​រំលែក​របស់​ទៅ​សាធារណៈ​ជាមួយ​តំណ"
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
-msgstr ""
+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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ចែក​រំលែក​របស់​ទៅ​សាធារណៈ​ជាមួយ​តំណ"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "អនុញ្ញាត​ការ​ចែក​រំលែក​ម្ដង​ទៀត"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ចែក​រំលែក​ជាមួយ​នរណា​ម្នាក់"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "សុវត្ថិភាព"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "បង្ខំ HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
-msgstr ""
+msgstr "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
-msgstr ""
+msgstr "ពី​អាសយដ្ឋាន"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
-msgstr ""
+msgstr "ច្រក"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
-msgstr ""
+msgstr "ផ្ញើ​អ៊ីមែល"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "កម្រិត Log"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "ច្រើន​ទៀត"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "តិច"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "កំណែ"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -706,11 +729,11 @@ msgstr "ពាក្យសម្ងាត់"
 
 #: templates/personal.php:39
 msgid "Your password was changed"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាត់​របស់​អ្នក​ត្រូវ​បាន​ប្ដូរ"
 
 #: templates/personal.php:40
 msgid "Unable to change your password"
-msgstr ""
+msgstr "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​របស់​អ្នក​បាន​ទេ"
 
 #: templates/personal.php:42
 msgid "Current password"
@@ -744,19 +767,19 @@ msgstr ""
 
 #: templates/personal.php:89
 msgid "Profile picture"
-msgstr ""
+msgstr "រូបភាព​ប្រវត្តិរូប"
 
 #: templates/personal.php:94
 msgid "Upload new"
-msgstr ""
+msgstr "ផ្ទុកឡើង​ថ្មី"
 
 #: templates/personal.php:96
 msgid "Select new from Files"
-msgstr ""
+msgstr "ជ្រើស​ថ្មី​ពី​ឯកសារ"
 
 #: templates/personal.php:97
 msgid "Remove image"
-msgstr ""
+msgstr "ដក​រូបភាព​ចេញ"
 
 #: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
@@ -782,27 +805,31 @@ msgstr "ភាសា"
 msgid "Help translate"
 msgstr "ជួយ​បក​ប្រែ"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
+msgstr "ពាក្យ​សម្ងាត់​ចូល​គណនី"
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
 msgstr ""
 
 #: templates/users.php:19
@@ -825,7 +852,7 @@ msgstr ""
 
 #: templates/users.php:40
 msgid "Default Storage"
-msgstr ""
+msgstr "ឃ្លាំង​ផ្ទុក​លំនាំ​ដើម"
 
 #: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -833,7 +860,7 @@ msgstr ""
 
 #: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
-msgstr ""
+msgstr "មិន​កំណត់"
 
 #: templates/users.php:64 templates/users.php:161
 msgid "Other"
@@ -845,7 +872,7 @@ msgstr "ឈ្មោះ​អ្នកប្រើ"
 
 #: templates/users.php:92
 msgid "Storage"
-msgstr ""
+msgstr "ឃ្លាំង​ផ្ទុក"
 
 #: templates/users.php:106
 msgid "change full name"
@@ -853,8 +880,8 @@ msgstr ""
 
 #: templates/users.php:110
 msgid "set new password"
-msgstr ""
+msgstr "កំណត់​ពាក្យ​សម្ងាត់​ថ្មី"
 
 #: templates/users.php:141
 msgid "Default"
-msgstr ""
+msgstr "លំនាំ​ដើម"
diff --git a/l10n/km/user_ldap.po b/l10n/km/user_ldap.po
index a5975172fc..649aafa276 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -87,63 +87,63 @@ msgstr ""
 msgid "Error"
 msgstr "កំហុស"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "សាក​ល្បង​ការ​ត​ភ្ជាប់ បាន​ជោគជ័យ"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "សាកល្បង​ការ​តភ្ជាប់ មិន​បាន​សម្រេច"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "តើ​អ្នក​ពិត​ជា​ចង់​លុប​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ​បច្ចុប្បន្ន​មែន​ទេ?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "បញ្ជាក់​ការ​លុប"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -234,7 +234,7 @@ msgstr ""
 
 #: templates/part.wizard-server.php:36
 msgid "Port"
-msgstr ""
+msgstr "ច្រក"
 
 #: templates/part.wizard-server.php:44
 msgid "User DN"
@@ -284,7 +284,7 @@ msgstr ""
 
 #: templates/part.wizardcontrols.php:8
 msgid "Continue"
-msgstr ""
+msgstr "បន្ត"
 
 #: templates/settings.php:11
 msgid ""
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index 77ca23e3f5..db3e608c4b 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,202 +58,202 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -285,12 +285,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -318,107 +318,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -662,6 +671,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index 75d448c056..0f58258458 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,128 +177,132 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -331,68 +339,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/kn/files_external.po b/l10n/kn/files_external.po
index 9d3bc47614..41c0de8c2f 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/kn/files_sharing.po b/l10n/kn/files_sharing.po
index ab5742aad4..391c5851f5 100644
--- a/l10n/kn/files_sharing.po
+++ b/l10n/kn/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/kn/files_trashbin.po b/l10n/kn/files_trashbin.po
index 5e3bacaffe..1fa5cc3019 100644
--- a/l10n/kn/files_trashbin.po
+++ b/l10n/kn/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po
index 4cee69fe77..aa581f544a 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index b2914c0adc..1e40c55697 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 302d5860f1..b129e5aeb9 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -65,202 +65,202 @@ msgstr "사용 가능한 프로필 사진이 없습니다. 다시 시도하십
 msgid "No crop data provided"
 msgstr "선택된 데이터가 없습니다."
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "일요일"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "월요일"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "화요일"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "수요일"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "목요일"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "금요일"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "토요일"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "1월"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "2월"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "3월"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "4월"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "5월"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "6월"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "7월"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "8월"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "9월"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "10월"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "11월"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "12월"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "저장 중..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "초 전"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n분 전 "
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n시간 전 "
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "오늘"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "어제"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n일 전 "
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "지난 달"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n달 전 "
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "작년"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "년 전"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "선택"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "파일 선택 템플릿을 불러오는 중 오류 발생: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "예"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "아니요"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "선택"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "파일 선택 템플릿을 불러오는 중 오류 발생: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "확인"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "메시지 템플릿을 불러오는 중 오류 발생: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "파일 {count}개 충돌"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "파일 1개 충돌"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "어느 파일을 유지하시겠습니까?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "두 버전을 모두 선택하면, 파일 이름에 번호가 추가될 것입니다."
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "취소"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "계속"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(모두 선택됨)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count}개 선택됨)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "파일 존재함 템플릿을 불러오는 중 오류 발생"
 
@@ -292,12 +292,12 @@ msgstr "공유됨"
 msgid "Share"
 msgstr "공유"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "오류"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "공유하는 중 오류 발생"
 
@@ -325,107 +325,116 @@ msgstr "사용자 및 그룹과 공유..."
 msgid "Share link"
 msgstr "링크 공유"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "암호 보호"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "암호"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "공개 업로드 허용"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "이메일 주소"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "전송"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "만료 날짜 설정"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "만료 날짜"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "이메일로 공유:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "발견된 사람 없음"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "그룹"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "다시 공유할 수 없습니다"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "{user} 님과 {item}에서 공유 중"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "공유 해제"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "이메일로 알림"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "편집 가능"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "접근 제어"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "생성"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "업데이트"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "삭제"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "공유"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "암호로 보호됨"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "만료 날짜 해제 오류"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "만료 날짜 설정 오류"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "전송 중..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "이메일 발송됨"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "경고"
 
@@ -669,6 +678,10 @@ msgstr "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_bla
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>관리자 계정</strong> 만들기"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "암호"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "스토리지 & 데이터베이스"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 87d3b833e5..c866902cc8 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -33,7 +33,7 @@ msgstr "항목 %s을(를) 이동시킬 수 없음 - 같은 이름의 파일이 
 msgid "Could not move %s"
 msgstr "항목 %s을(를) 이동시킬 수 없음"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "파일 이름이 비어 있을 수 없습니다."
 
@@ -42,18 +42,18 @@ msgstr "파일 이름이 비어 있을 수 없습니다."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -145,28 +145,32 @@ msgstr "업로드에 실패했습니다. 파일 정보를 가져올 수 없습
 msgid "Invalid directory."
 msgstr "올바르지 않은 디렉터리입니다."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "파일"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "{filename}을(를) 업로드할 수 없습니다. 폴더이거나 0 바이트 파일입니다."
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "업로드가 취소되었습니다."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "서버에서 결과를 가져올 수 없습니다."
 
@@ -179,128 +183,132 @@ msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 
 msgid "URL cannot be empty"
 msgstr "URL이 비어있을 수 없음"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name}이(가) 이미 존재함"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "파일을 만들 수 없음"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "폴더를 만들 수 없음"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "URL을 가져올 수 없음"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "공유"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "영구히 삭제"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "파일 이동 오류"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "다운로드 준비 중입니다. 파일 크기가 크면 시간이 오래 걸릴 수도 있습니다."
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "오류"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "대기 중"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "파일 이동 오류"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "오류"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "이름을 변경할 수 없음"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "파일 삭제 오류."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "이름"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "크기"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "수정됨"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "폴더 %n개"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "파일 %n개"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} 그리고 {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "파일 %n개 업로드 중"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 동기화할 수 없습니다!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오"
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "암호화는 해제되어 있지만, 파일은 아직 암호화되어 있습니다. 개인 설정에서 파일을 복호화하십시오."
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
-msgstr "다운로드 준비 중입니다. 파일 크기가 크면 시간이 오래 걸릴 수도 있습니다."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} 그리고 {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "이름"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "크기"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "수정됨"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s의 이름을 변경할 수 없습니다"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -337,68 +345,75 @@ msgstr "ZIP 파일 최대 크기"
 msgid "Save"
 msgstr "저장"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "새로 만들기"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "새 텍스트 파일"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "텍스트 파일"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "새 폴더"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "폴더"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "링크에서"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "삭제된 파일"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "업로드 취소"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr "여기에 파일을 업로드하거나 만들 권한이 없습니다"
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "내용이 없습니다. 업로드할 수 있습니다!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "삭제"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "업로드한 파일이 너무 큼"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다."
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "파일을 검색하고 있습니다. 기다려 주십시오."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "현재 검색"
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index f49c86091e..eb93989d91 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Shinjo Park <kde@peremen.name>, 2013
+# 책읽는달팽 <bjh13579@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-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -18,6 +19,166 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "장소"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "호스트"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "사용자 이름"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "암호"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "공유"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "접근 허가됨"
@@ -40,31 +201,31 @@ msgstr "Google 드라이브 저장소 설정 오류"
 
 #: js/settings.js:318 js/settings.js:325
 msgid "Saved"
-msgstr ""
+msgstr "저장됨"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 9d574617b6..8ff6d87393 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -20,7 +20,7 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "{owner} 님이 공유함"
 
@@ -60,16 +60,15 @@ msgstr "공유가 비활성화됨"
 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:21
+msgid "Download"
+msgstr "다운로드"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "직접 링크"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index dfa513dead..00c602a5f0 100644
--- a/l10n/ko/files_trashbin.po
+++ b/l10n/ko/files_trashbin.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -30,38 +30,34 @@ msgstr "%s을(를_ 영구적으로 삭제할 수 없습니다"
 msgid "Couldn't restore %s"
 msgstr "%s을(를) 복원할 수 없습니다"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "이름"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "복원"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "오류"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "복원됨"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "휴지통이 비어 있습니다!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "이름"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "삭제됨"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "삭제"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index 3282c2f6e6..b0daf07605 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -7,13 +7,13 @@
 # chohy <chohy@yahoo.com>, 2013
 # chohy <chohy@yahoo.com>, 2013
 # Park Shinjo <peremen@gmail.com>, 2013
-# 책읽는달팽 <bjh13579@gmail.com>, 2013
+# 책읽는달팽 <bjh13579@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -22,12 +22,15 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -78,23 +81,23 @@ msgstr "잘못된 그림"
 msgid "web services under your control"
 msgstr "내가 관리하는 웹 서비스"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP 다운로드가 비활성화 되었습니다."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "파일을 개별적으로 다운로드해야 합니다."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "파일로 돌아가기"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "선택한 파일들은 ZIP 파일을 생성하기에 너무 큽니다."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -170,7 +173,7 @@ msgstr "토큰이 만료되었습니다. 페이지를 새로 고치십시오."
 
 #: private/json.php:74
 msgid "Unknown user"
-msgstr ""
+msgstr "알려지지 않은 사용자"
 
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
@@ -212,7 +215,7 @@ msgstr "기존 계정이나 administrator(관리자)를 입력해야 합니다."
 
 #: 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
@@ -240,20 +243,20 @@ 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"
-msgstr ""
+msgstr "MySQL/MariaDB에서 이 사용자 제거하기"
 
 #: private/setup/mysql.php:91
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL/MariaDB '%s'@'%%' 사용자가 이미 존재합니다"
 
 #: 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"
@@ -280,19 +283,19 @@ msgstr "관리자의 사용자 이름을 설정합니다."
 msgid "Set an admin password."
 msgstr "관리자의 암호를 설정합니다."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오."
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s 님이 %s을(를) 공유하였습니다"
@@ -334,73 +337,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "분류 \"%s\"을(를) 찾을 수 없습니다."
@@ -453,7 +462,7 @@ msgstr "년 전"
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "사용자 명에는 다음과 같은 문자만 사용이 가능합니다: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\""
 
 #: private/user/manager.php:237
 msgid "A valid username must be provided"
@@ -465,4 +474,4 @@ msgstr "올바른 암호를 입력해야 함"
 
 #: private/user/manager.php:246
 msgid "The username is already being used"
-msgstr ""
+msgstr "이 사용자명은 현재 사용중입니다"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 067f88a248..74099284e4 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -29,7 +29,7 @@ msgstr ""
 
 #: admin/controller.php:73
 msgid "Saved"
-msgstr ""
+msgstr "저장됨"
 
 #: admin/controller.php:90
 msgid "test email settings"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "암호화"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -103,6 +103,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "이메일 저장됨"
@@ -119,6 +129,16 @@ msgstr "그룹을 삭제할 수 없음"
 msgid "Unable to delete user"
 msgstr "사용자를 삭제할 수 없음."
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "언어가 변경됨"
@@ -174,7 +194,7 @@ msgstr "백엔드에서 암호 변경을 지원하지 않지만, 사용자의 
 msgid "Unable to change password"
 msgstr "암호를 변경할 수 없음"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "보내는 중..."
 
@@ -230,34 +250,42 @@ msgstr "업데이트"
 msgid "Updated"
 msgstr "업데이트됨"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "프로필 사진 선택"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "매우 약한 암호"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "약한 암호"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "그저 그런 암호"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "좋은 암호"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "강력한 암호"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "파일 복호화 중... 시간이 걸릴 수도 있으니 기다려 주십시오."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "삭제됨"
@@ -303,7 +331,7 @@ msgstr "올바른 암호를 입력해야 함"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "경고: 사용자 \"{user}\"의 홈 디렉터리가 이미 존재합니다"
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "한국어"
 
@@ -491,148 +519,143 @@ msgstr "앱에서 공유 API를 사용할 수 있도록 허용"
 msgid "Allow links"
 msgstr "링크 허용"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "사용자가 개별 항목의 링크를 공유할 수 있도록 허용"
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "사용자가 개별 항목의 링크를 공유할 수 있도록 허용"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "재공유 허용"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "사용자에게 공유된 항목을 다시 공유할 수 있도록 허용"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "누구나와 공유할 수 있도록 허용"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "사용자가 속해 있는 그룹의 사용자에게만 공유할 수 있도록 허용"
+
 #: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
+msgstr "메일 알림 허용"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "보안"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "HTTPS 강제 사용"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "클라이언트가 %s에 연결할 때 암호화 연결을 강제로 사용합니다."
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "SSL 강제 설정을 변경하려면 %s에 HTTPS로 연결해야 합니다."
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "전자우편 서버"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "보낸 이 주소"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "인증 필요함"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "서버 주소"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "포트"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "자격 정보"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "SMTP 사용자명"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "SMTP 암호"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "시험용 전자우편 설정"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "전자우편 보내기"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "로그"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "로그 단계"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "더 중요함"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "덜 중요함"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "버전"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -785,29 +808,33 @@ msgstr "언어"
 msgid "Help translate"
 msgstr "번역 돕기"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다."
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "로그인 암호"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "모든 파일 복호화"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "로그인 이름"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index e6f093381f..964fe5081a 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -89,63 +89,63 @@ msgstr "성공"
 msgid "Error"
 msgstr "오류"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "설정 올바름"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "설정 올바르지 않음"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "설정 불완전함"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "그룹 선택"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "객체 클래스 선택"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "속성 선택"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "연결 시험 성공"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "연결 시험 실패"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "현재 서버 설정을 지우시겠습니까?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "삭제 확인"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "그룹 %s개 찾음"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "사용자 %s명 찾음"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "잘못된 호스트"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "필요한 기능을 찾을 수 없음"
 
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index b27679a529..df32e877fe 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "ده‌ستكاری"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "پاشکه‌وتده‌کات..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "بەڵێ"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "نەخێر"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "لابردن"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr "هاوبەشی کردن"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "هه‌ڵه"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "ئاگاداری"
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "وشەی تێپەربو"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 854432bc02..7567420c0d 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "په‌ڕگەکان"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "هاوبەشی کردن"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "هه‌ڵه"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "هه‌ڵه"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "ناو"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "ناو"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr "پاشکه‌وتکردن"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "بوخچه"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "داگرتن"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ku_IQ/files_external.po b/l10n/ku_IQ/files_external.po
index a7bfce656a..100e50d0e0 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "شوێن"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "ناوی به‌کارهێنه‌ر"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "وشەی تێپەربو"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "هاوبەشی کردن"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "ناونیشانی به‌سته‌ر"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index 72907a19e7..3d1f00d544 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "داگرتن"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index 951ebab0b4..43ba98914d 100644
--- a/l10n/ku_IQ/files_trashbin.po
+++ b/l10n/ku_IQ/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "ناو"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "هه‌ڵه"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "ناو"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index b7415893ec..0746ffe7ed 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index 0866a1a0bd..77c4105205 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "نهێنیکردن"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr "نوێکردنه‌وه"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "ناونیشانی ڕاژه"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "چوونەژوورەوە"
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 661ef51e48..df7aac2e22 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -86,43 +86,43 @@ msgstr "سه‌رکه‌وتن"
 msgid "Error"
 msgstr "هه‌ڵه"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr[1] ""
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:984
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 7b83600de6..701285ec38 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -60,207 +60,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Sonndeg"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Méindeg"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Dënschdeg"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Mëttwoch"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Donneschdeg"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Freideg"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Samschdeg"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Mäerz"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Abrëll"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mee"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "August"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Speicheren..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "Sekonnen hir"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n Minutt hir"
 msgstr[1] "%n Minutten hir"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "haut"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "gëschter"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "leschte Mount"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "Lescht Joer"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "Joren hir"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Auswielen"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Jo"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nee"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Auswielen"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "OK"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Weieng Fichieren wëlls de gär behalen?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Ofbriechen"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Weider"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(all ausgewielt)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} ausgewielt)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -292,12 +292,12 @@ msgstr "Gedeelt"
 msgid "Share"
 msgstr "Deelen"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Feeler"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Feeler beim Deelen"
 
@@ -325,107 +325,116 @@ msgstr ""
 msgid "Share link"
 msgstr "Link deelen"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Passwuertgeschützt"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passwuert"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Ëffentlechen Upload erlaaben"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Link enger Persoun mailen"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Schécken"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Verfallsdatum setzen"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Verfallsdatum"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Via E-Mail deelen:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Keng Persoune fonnt"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "Grupp"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Weiderdeelen ass net erlaabt"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Gedeelt an {item} mat {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Net méi deelen"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "via e-mail Bescheed ginn"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "kann änneren"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "Zougrëffskontroll"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "aktualiséieren"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "läschen"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "deelen"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Passwuertgeschützt"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Feeler beim Läsche vum Verfallsdatum"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Feeler beim Setze vum Verfallsdatum"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Gëtt geschéckt..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Email geschéckt"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Warnung"
 
@@ -669,6 +678,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "En <strong>Admin-Account</strong> uleeën"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passwuert"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index f137298360..558c5384c9 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Dateien"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Upload ofgebrach."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofg
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Deelen"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Ëm-benennen"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Fehler"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Fehler"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Numm"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Gréisst"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Geännert"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Numm"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Gréisst"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Geännert"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr "Maximal Gréisst fir ZIP Fichieren"
 msgid "Save"
 msgstr "Späicheren"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Nei"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Text Fichier"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Dossier"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Upload ofbriechen"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Hei ass näischt. Lued eppes rop!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Läschen"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Upload ze grouss"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Fichieren gi gescannt, war weg."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Momentane Scan"
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index 36504b273f..bae4eea31b 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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,6 +17,166 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Uert"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Benotzernumm"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Passwuert"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Deelen"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index bda126eb82..da450f66a3 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -58,16 +58,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Download"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index 2987c2e4d6..8907d5aed4 100644
--- a/l10n/lb/files_trashbin.po
+++ b/l10n/lb/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Fehler"
-
-#: 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 "Numm"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Fehler"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Numm"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Läschen"
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index e875ee307c..4beb21f07c 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -18,12 +18,15 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -74,23 +77,23 @@ msgstr "Ongülteg d'Bild"
 msgid "web services under your control"
 msgstr "Web-Servicer ënnert denger Kontroll"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -276,19 +279,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "Den/D' %s huet »%s« mat dir gedeelt"
@@ -330,73 +333,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index c37e8ad4c4..c470c37e7d 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -99,6 +99,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "E-mail gespäichert"
@@ -115,6 +125,16 @@ msgstr "Onmeiglech d'Grup ze läschen."
 msgid "Unable to delete user"
 msgstr "Onmeiglech User zu läschen."
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Sprooch huet geännert"
@@ -170,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -226,34 +246,42 @@ msgstr "Update"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "geläscht"
@@ -299,7 +327,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -487,148 +515,143 @@ msgstr "Erlab Apps d'Share API ze benotzen"
 msgid "Allow links"
 msgstr "Links erlaben"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 "Resharing erlaben"
-
-#: 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 "Useren erlaben mat egal wiem ze sharen"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Resharing erlaben"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Useren erlaben mat egal wiem ze sharen"
+
+#: templates/admin.php:263
+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:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Server Adress"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Méi"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Manner"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +804,33 @@ msgstr "Sprooch"
 msgid "Help translate"
 msgstr "Hëllef iwwersetzen"
 
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Login"
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 626213c72a..5ee8209b03 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -86,65 +86,65 @@ msgstr ""
 msgid "Error"
 msgstr "Fehler"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 43b150af1a..e8c31c45fb 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -63,212 +63,212 @@ msgstr "Nėra laikino profilio paveikslėlio, bandykite dar kartą"
 msgid "No crop data provided"
 msgstr "Nenurodyti apkirpimo duomenys"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Antradienis"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Trečiadienis"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Šeštadienis"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Sausis"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Vasaris"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Kovas"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Balandis"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Gegužė"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Birželis"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Liepa"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Rugpjūtis"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Rugsėjis"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Spalis"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Lapkritis"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Gruodis"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Saugoma..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "prieš sekundę"
 
-#: js/js.js:1247
+#: js/js.js:1241
 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:1248
+#: js/js.js:1242
 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:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "šiandien"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:1251
+#: js/js.js:1245
 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:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "praeitą mėnesį"
 
-#: js/js.js:1253
+#: js/js.js:1247
 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:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "praeitais metais"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "prieš metus"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Pasirinkite"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Klaida įkeliant failo parinkimo ruošinį: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Taip"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Pasirinkite"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Klaida įkeliant failo parinkimo ruošinį: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Gerai"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Klaida įkeliant žinutės ruošinį: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} failas konfliktuoja"
 msgstr[1] "{count} failai konfliktuoja"
 msgstr[2] "{count} failų konfliktų"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Vienas failo konfliktas"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Kuriuos failus norite laikyti?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Tęsti"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(visi pažymėti)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} pažymėtų)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Klaida įkeliant esančių failų ruošinį"
 
@@ -300,12 +300,12 @@ msgstr "Dalinamasi"
 msgid "Share"
 msgstr "Dalintis"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Klaida"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Klaida, dalijimosi metu"
 
@@ -333,107 +333,116 @@ msgstr "Dalintis su vartotoju arba grupe..."
 msgid "Share link"
 msgstr "Dalintis nuoroda"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Apsaugotas slaptažodžiu"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Slaptažodis"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Leisti viešą įkėlimą"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Nusiųsti nuorodą paštu"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Siųsti"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Nustatykite galiojimo laiką"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Galiojimo laikas"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Dalintis per el. paštą:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Žmonių nerasta"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grupė"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Dalijinasis išnaujo negalimas"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Pasidalino {item} su {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Nebesidalinti"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "pranešti el. paštu"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "gali redaguoti"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "priėjimo kontrolė"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "sukurti"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "atnaujinti"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "ištrinti"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "dalintis"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Apsaugota slaptažodžiu"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Klaida nuimant galiojimo laiką"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Klaida nustatant galiojimo laiką"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Siunčiama..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Laiškas išsiųstas"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Įspėjimas"
 
@@ -677,6 +686,10 @@ msgstr "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serve
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sukurti <strong>administratoriaus paskyrą</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Slaptažodis"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 62282b8398..4330a3e563 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -30,7 +30,7 @@ msgstr "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja"
 msgid "Could not move %s"
 msgstr "Nepavyko perkelti %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Failo pavadinimas negali būti tuščias."
 
@@ -39,18 +39,18 @@ msgstr "Failo pavadinimas negali būti tuščias."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -142,28 +142,32 @@ msgstr "Įkėlimas nepavyko. Nepavyko gauti failo informacijos."
 msgid "Invalid directory."
 msgstr "Neteisingas aplankas"
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Failai"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Įkėlimas atšauktas."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Nepavyko gauti rezultato iš serverio."
 
@@ -176,134 +180,138 @@ msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutr
 msgid "URL cannot be empty"
 msgstr "URL negali būti tuščias."
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} jau egzistuoja"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Neįmanoma sukurti failo"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Neįmanoma sukurti aplanko"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Klauda gaunant URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Dalintis"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Ištrinti negrįžtamai"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Klaida perkeliant failą"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Klaida"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Laukiantis"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Klaida perkeliant failą"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Klaida"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Neįmanoma pervadinti failo"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Klaida trinant failą."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Pavadinimas"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Dydis"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Pakeista"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n aplankas"
 msgstr[1] "%n aplankai"
 msgstr[2] "%n aplankų"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n failas"
 msgstr[1] "%n failai"
 msgstr[2] "%n failų"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} ir {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Įkeliamas %n failas"
 msgstr[1] "Įkeliami %n failai"
 msgstr[2] "Įkeliama %n failų"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Jūsų visa vieta serveryje užimta"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti"
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Netinkamas privatus raktas Šifravimo programai. Prašome atnaujinti savo privataus rakto slaptažodį asmeniniuose nustatymuose, kad atkurti prieigą prie šifruotų failų."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} ir {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Pavadinimas"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Dydis"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Pakeista"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s negali būti pervadintas"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -340,68 +348,75 @@ msgstr "Maksimalus ZIP archyvo failo dydis"
 msgid "Save"
 msgstr "Išsaugoti"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Naujas"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Naujas tekstinis failas"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Teksto failas"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Naujas aplankas"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Katalogas"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Iš nuorodos"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Ištrinti failai"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Atšaukti siuntimą"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Čia tuščia. Įkelkite ką nors!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Įkėlimui failas per didelis"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Skenuojami failai, prašome palaukti."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Šiuo metu skenuojama"
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index 32c73989f7..a3b5520690 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -18,6 +18,166 @@ 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"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Vieta"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Mazgas"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Prisijungimo vardas"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Slaptažodis"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Dalintis"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Priėjimas suteiktas"
@@ -42,29 +202,29 @@ msgstr "Klaida nustatinėjant Google Drive talpyklą"
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index 4698175896..acc3188171 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +20,7 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Bendrina {owner}"
 
@@ -60,16 +60,15 @@ msgstr "dalinimasis yra išjungtas"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "pasidalino %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Atsisiųsti"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Tiesioginė nuoroda"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index f8985e010c..a5b14de504 100644
--- a/l10n/lt_LT/files_trashbin.po
+++ b/l10n/lt_LT/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -29,38 +29,34 @@ msgstr "Nepavyko negrįžtamai ištrinti %s"
 msgid "Couldn't restore %s"
 msgstr "Nepavyko atkurti %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Ištrinti failai"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Klaida"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Ištrinti failai"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "atstatyta"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Nieko nėra. Jūsų šiukšliadėžė tuščia!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Pavadinimas"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Atstatyti"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Klaida"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "atstatyta"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Nieko nėra. Jūsų šiukšliadėžė tuščia!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Pavadinimas"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Ištrinti"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Ištrinti"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 1ebb5244f1..09a549a957 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -21,12 +21,15 @@ 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"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -77,23 +80,23 @@ msgstr "Netinkamas paveikslėlis"
 msgid "web services under your control"
 msgstr "jūsų valdomos web paslaugos"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP atsisiuntimo galimybė yra išjungta."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Failai turi būti parsiunčiami vienas po kito."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Atgal į Failus"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Pasirinkti failai per dideli archyvavimui į ZIP."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -279,19 +282,19 @@ msgstr "Nustatyti administratoriaus naudotojo vardą."
 msgid "Set an admin password."
 msgstr "Nustatyti administratoriaus slaptažodį."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s pasidalino »%s« su tavimi"
@@ -333,73 +336,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Nepavyko rasti kategorijos „%s“"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 7c69da8e29..2ae3e9b2d5 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Šifravimas"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -103,6 +103,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "El. paštas išsaugotas"
@@ -119,6 +129,16 @@ msgstr "Nepavyko ištrinti grupės"
 msgid "Unable to delete user"
 msgstr "Nepavyko ištrinti vartotojo"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Kalba pakeista"
@@ -174,7 +194,7 @@ msgstr "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo rakta
 msgid "Unable to change password"
 msgstr "Nepavyksta pakeisti slaptažodžio"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -230,34 +250,42 @@ msgstr "Atnaujinti"
 msgid "Updated"
 msgstr "Atnaujinta"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Pažymėkite profilio paveikslėlį"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Iššifruojami failai... Prašome palaukti, tai gali užtrukti."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "ištrinta"
@@ -303,7 +331,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Kalba"
 
@@ -491,148 +519,143 @@ msgstr "Leidžia programoms naudoti Share API"
 msgid "Allow links"
 msgstr "Lesti nuorodas"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Leisti viešus įkėlimus"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Leisti dalintis"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Leisti naudotojams dalintis su bet kuo"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Leisti el. pašto perspėjimą"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Leisti naudotojams viešai dalintis elementais su nuorodomis"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Leisti dalintis"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Leisti naudotojams toliau dalintis elementais pasidalintais su jais"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Leisti naudotojams dalintis su bet kuo"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "Leisti naudotojams dalintis tik su naudotojais savo grupėje"
+
 #: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
+msgstr "Leisti el. pašto perspėjimą"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Saugumas"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Reikalauti HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Serverio adresas"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Prievadas"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Žurnalas"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Žurnalo išsamumas"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Daugiau"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Mažiau"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versija"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -785,29 +808,33 @@ msgstr "Kalba"
 msgid "Help translate"
 msgstr "Padėkite išversti"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Prisijungimo slaptažodis"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Iššifruoti visus failus"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Vartotojo vardas"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 30bc2cdbcf..4d7aa27724 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -88,47 +88,47 @@ msgstr "Sėkmingai"
 msgid "Error"
 msgstr "Klaida"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Pasirinkti grupes"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Ryšio patikrinimas pavyko"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Ryšio patikrinimas nepavyko"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Ar tikrai norite ištrinti dabartinę serverio konfigūraciją?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Patvirtinkite trynimą"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -136,7 +136,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -144,11 +144,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 57162fa281..d738964134 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -59,212 +59,212 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Svētdiena"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Pirmdiena"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Otrdiena"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Trešdiena"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Ceturtdiena"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Piektdiena"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sestdiena"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Janvāris"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februāris"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Marts"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Aprīlis"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Maijs"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Jūnijs"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Jūlijs"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Augusts"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Septembris"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktobris"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Novembris"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Decembris"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Saglabā..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "sekundes atpakaļ"
 
-#: js/js.js:1247
+#: js/js.js:1241
 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:1248
+#: js/js.js:1242
 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:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "šodien"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:1251
+#: js/js.js:1245
 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:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "pagājušajā mēnesī"
 
-#: js/js.js:1253
+#: js/js.js:1247
 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:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "gājušajā gadā"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "gadus atpakaļ"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Izvēlieties"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Jā"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nē"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Izvēlieties"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Labi"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Jaunās datnes"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -296,12 +296,12 @@ msgstr "Kopīgs"
 msgid "Share"
 msgstr "Dalīties"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Kļūda"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Kļūda, daloties"
 
@@ -329,107 +329,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Aizsargāt ar paroli"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Parole"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Ļaut publisko augšupielādi."
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Sūtīt saiti personai pa e-pastu"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Sūtīt"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Iestaties termiņa datumu"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Termiņa datums"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Dalīties, izmantojot e-pastu:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Nav atrastu cilvēku"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grupa"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Atkārtota dalīšanās nav atļauta"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Dalījās ar {item} ar {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Pārtraukt dalīšanos"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "var rediģēt"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "piekļuves vadība"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "izveidot"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "atjaunināt"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "dzēst"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "dalīties"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Aizsargāts ar paroli"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Kļūda, noņemot termiņa datumu"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Kļūda, iestatot termiņa datumu"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Sūta..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Vēstule nosūtīta"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Brīdinājums"
 
@@ -673,6 +682,10 @@ msgstr "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"
 msgid "Create an <strong>admin account</strong>"
 msgstr "Izveidot <strong>administratora kontu</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Parole"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 9b3ff96f19..df92f298de 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -28,7 +28,7 @@ msgstr "Nevarēja pārvietot %s — jau eksistē datne ar tādu nosaukumu"
 msgid "Could not move %s"
 msgstr "Nevarēja pārvietot %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Datnes nosaukums nevar būt tukšs."
 
@@ -37,18 +37,18 @@ msgstr "Datnes nosaukums nevar būt tukšs."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -140,28 +140,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr "Nederīga direktorija."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Datnes"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Augšupielāde ir atcelta."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -174,134 +178,138 @@ msgstr "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde."
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} jau eksistē"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Dalīties"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Dzēst pavisam"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Pārsaukt"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr ""
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Kļūda"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Gaida savu kārtu"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Kļūda"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nosaukums"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Izmērs"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Mainīts"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mapes"
 msgstr[1] "%n mape"
 msgstr[2] "%n mapes"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n faili"
 msgstr[1] "%n fails"
 msgstr[2] "%n faili"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n"
 msgstr[1] "Augšupielāde %n failu"
 msgstr[2] "Augšupielāde %n failus"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nosaukums"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Izmērs"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Mainīts"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s nevar tikt pārsaukts"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -338,68 +346,75 @@ msgstr "Maksimālais ievades izmērs ZIP datnēm"
 msgid "Save"
 msgstr "Saglabāt"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Jauna"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Teksta datne"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Jauna mape"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Mape"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "No saites"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Dzēstās datnes"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Atcelt augšupielādi"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Lejupielādēt"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Dzēst"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Datne ir par lielu, lai to augšupielādētu"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Šobrīd tiek caurskatīts"
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index 46000f211f..bfa5af02d7 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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,6 +18,166 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Vieta"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Resursdators"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Lietotājvārds"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Parole"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Dalīties"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Piešķirta pieeja"
@@ -42,29 +202,29 @@ msgstr "Kļūda, konfigurējot Google Drive krātuvi"
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index c55209b6fc..8a8a8a2295 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Dalījās {owner}"
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Lejupielādēt"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index 42da8f5858..ab45a367bd 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Nevarēja pilnībā izdzēst %s"
 msgid "Couldn't restore %s"
 msgstr "Nevarēja atjaunot %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Dzēstās datnes"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Kļūda"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Dzēstās datnes"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "atjaunots"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Šeit nekā nav. Jūsu miskaste ir tukša!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nosaukums"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Atjaunot"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Kļūda"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "atjaunots"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Šeit nekā nav. Jūsu miskaste ir tukša!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nosaukums"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Dzēsts"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Dzēst"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index 57643d7f43..3195f1e39a 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +18,15 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -74,23 +77,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "tīmekļa servisi tavā varā"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP lejupielādēšana ir izslēgta."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Datnes var lejupielādēt tikai katru atsevišķi."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Atpakaļ pie datnēm"
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -276,19 +279,19 @@ msgstr "Iestatiet administratora lietotājvārdu."
 msgid "Set an admin password."
 msgstr "Iestatiet administratora paroli."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s kopīgots »%s« ar jums"
@@ -330,73 +333,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Nevarēja atrast kategoriju “%s”"
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 9950bba6e1..f930d58161 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Šifrēšana"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -99,6 +99,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "E-pasts tika saglabāts"
@@ -115,6 +125,16 @@ msgstr "Nevar izdzēst grupu"
 msgid "Unable to delete user"
 msgstr "Nevar izdzēst lietotāju"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Valoda tika nomainīta"
@@ -170,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -226,34 +246,42 @@ msgstr "Atjaunināt"
 msgid "Updated"
 msgstr "Atjaunināta"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "izdzests"
@@ -299,7 +327,7 @@ msgstr "Jānorāda derīga parole"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__valodas_nosaukums__"
 
@@ -487,148 +515,143 @@ msgstr "Ļauj lietotnēm izmantot koplietošanas API"
 msgid "Allow links"
 msgstr "Atļaut saites"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Atļaut publisko augšupielādi"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Atļaut atkārtotu koplietošanu"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Ļaut lietotājiem dalīties ar visiem"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+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:252
+msgid "Allow resharing"
+msgstr "Atļaut atkārtotu koplietošanu"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Ļaut lietotājiem dalīties ar vienumiem atkārtoti"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Ļaut lietotājiem dalīties ar visiem"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Drošība"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Uzspiest HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Servera adrese"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Ports"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Akreditācijas dati"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Žurnāls"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Žurnāla līmenis"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Vairāk"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Mazāk"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versija"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +804,33 @@ msgstr "Valoda"
 msgid "Help translate"
 msgstr "Palīdzi tulkot"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Pieslēgšanās parole"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Atšifrēt visus failus"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Ierakstīšanās vārds"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 612df2687b..d9b224b398 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -86,47 +86,47 @@ msgstr ""
 msgid "Error"
 msgstr "Kļūda"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Izvēlieties grupas"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Savienojuma tests ir veiksmīgs"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Savienojuma tests cieta neveiksmi"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Vai tiešām vēlaties dzēst pašreizējo servera konfigurāciju?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Apstiprināt dzēšanu"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -134,7 +134,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -142,11 +142,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index b46bd8c51e..0c0ff2345d 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -59,207 +59,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Недела"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Понеделник"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Среда"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Четврток"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Петок"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Сабота"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Јануари"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Февруари"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Март"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Април"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Мај"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Јуни"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Јули"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Август"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Септември"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Октомври"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Ноември"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Декември"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Подесувања"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Снимам..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "пред секунди"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "денеска"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "минатиот месец"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "минатата година"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "пред години"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Избери"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Да"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Не"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Избери"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Во ред"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Конфликт со една датотека"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Откажи"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Продолжи"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(сите одбрани)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} одбраните)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Грешка при вчитување на датотеката, шаблонот постои "
 
@@ -291,12 +291,12 @@ msgstr "Споделен"
 msgid "Share"
 msgstr "Сподели"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Грешка"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Грешка при споделување"
 
@@ -324,107 +324,116 @@ msgstr ""
 msgid "Share link"
 msgstr "Сподели ја врската"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Заштити со лозинка"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Лозинка"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Дозволи јавен аплоуд"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Прати врска по е-пошта на личност"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Прати"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Постави рок на траење"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Рок на траење"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Сподели по е-пошта:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Не се најдени луѓе"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "група"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Повторно споделување не е дозволено"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Споделено во {item} со {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Не споделувај"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "извести преку електронска пошта"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "може да се измени"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "контрола на пристап"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "креирај"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "ажурирај"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "избриши"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "сподели"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Заштитено со лозинка"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Грешка при тргање на рокот на траење"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Грешка при поставување на рок на траење"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Праќање..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Е-порака пратена"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Предупредување"
 
@@ -668,6 +677,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Направете <strong>администраторска сметка</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Лозинка"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 61ca9d6d95..b602ca0ece 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -28,7 +28,7 @@ msgstr "Не можам да го преместам %s - Датотека со
 msgid "Could not move %s"
 msgstr "Не можам да ги префрлам %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Името на датотеката не може да биде празно."
 
@@ -37,18 +37,18 @@ msgstr "Името на датотеката не може да биде пра
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -140,28 +140,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr "Погрешна папка."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Датотеки"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Преземањето е прекинато."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Не можам да добијам резултат од серверот."
 
@@ -174,131 +178,135 @@ msgstr "Подигање на датотека е во тек. Напуштењ
 msgid "URL cannot be empty"
 msgstr "URL-то не може да биде празно"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} веќе постои"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Не множам да креирам датотека"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Не можам да креирам папка"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Сподели"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Трајно избришани"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Преименувај"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Грешка при префрлање на датотека"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Вашето преземање се подготвува. Ова може да потрае до колку датотеките се големи."
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Грешка"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Чека"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Грешка при префрлање на датотека"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Грешка"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Не можам да ја преименувам датотеката"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Име"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Големина"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Променето"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} и {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Вашиот сториџ е полн, датотеките веќе не можат да се освежуваат или синхронизираат!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Вашиот сториџ е скоро полн ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
-msgstr "Вашето преземање се подготвува. Ова може да потрае до колку датотеките се големи."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} и {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Име"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Големина"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Променето"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s не може да биде преименуван"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -335,68 +343,75 @@ msgstr "Максимална големина за внес на ZIP датот
 msgid "Save"
 msgstr "Сними"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Ново"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Текстуална датотека"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Папка"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Од врска"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Избришани датотеки"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Откажи прикачување"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Тука нема ништо. Снимете нешто!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Избриши"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Фајлот кој се вчитува е преголем"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер."
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Се скенираат датотеки, ве молам почекајте."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Моментално скенирам"
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index c8506cdd94..ccd34d9e73 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -17,6 +17,166 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Локација"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Домаќин"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Корисничко име"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Лозинка"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Сподели"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "Адреса"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Пристапот е дозволен"
@@ -41,29 +201,29 @@ msgstr "Грешка при конфигурација на Google Drive"
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index 3249f896d6..0e87f28ba0 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Споделени од {owner}"
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Преземи"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index eceeee5f0e..1261f9fd58 100644
--- a/l10n/mk/files_trashbin.po
+++ b/l10n/mk/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 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"
@@ -28,38 +28,34 @@ msgstr "Не можеше трајно да се избрише %s"
 msgid "Couldn't restore %s"
 msgstr "Не можеше да се поврати %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "Име"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Поврати"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Грешка"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "повратени"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Тука нема ништо. Вашата корпа за отпадоци е празна!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Име"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Избришан"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Избриши"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index 99993662a9..b4e922b0a9 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -17,12 +17,15 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr "Невалидна фотографија"
 msgid "web services under your control"
 msgstr "веб сервиси под Ваша контрола"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Преземање во ZIP е исклучено"
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Датотеките треба да се симнат една по една."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Назад кон датотеки"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Избраните датотеки се преголеми за да се генерира zip."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Не можам да најдам категорија „%s“"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index d666e4f265..24114c464e 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Енкрипција"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -99,6 +99,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Електронската пошта е снимена"
@@ -115,6 +125,16 @@ msgstr "Неможе да избришам група"
 msgid "Unable to delete user"
 msgstr "Неможам да избришам корисник"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Јазикот е сменет"
@@ -170,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr "Вашата лозинка неможе да се смени"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -226,34 +246,42 @@ msgstr "Ажурирај"
 msgid "Updated"
 msgstr "Надграден"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Одбери фотографија за профилот"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "избришан"
@@ -299,7 +327,7 @@ msgstr "Мора да се обезбеди валидна лозинка"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -487,148 +515,143 @@ msgstr "Дозволете апликациите да го користат API
 msgid "Allow links"
 msgstr "Дозволи врски"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Овозможи повторно споделување"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Овозможи корисниците да споделуваат со секого"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "Овозможи корисниците да споделуваат со корисници од своите групи"
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr "Овозможи известување по електронска пошта"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Безбедност"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Наметни HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Адреса на сервер"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Порта"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Записник"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Ниво на логирање"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Повеќе"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Помалку"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +804,33 @@ msgstr "Јазик"
 msgid "Help translate"
 msgstr "Помогни во преводот"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Лозинка за најавување"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Дешифрирај ги сите датотеки"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Име за најава"
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 5c6b12911b..b13f8545e2 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -87,65 +87,65 @@ msgstr ""
 msgid "Error"
 msgstr "Грешка"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Тестот за поврзување е успешен"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Тестот за поврзување не е успешен"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Потврдете го бришењето"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/ml/core.po b/l10n/ml/core.po
index bc9734a075..e4d4b1e6dd 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/ml/files.po b/l10n/ml/files.po
index 11605e3122..037dd3dec2 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ml/files_external.po b/l10n/ml/files_external.po
index 30d269647a..2801451ebe 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ml/files_sharing.po b/l10n/ml/files_sharing.po
index 1c510a7f4d..7a71f3189c 100644
--- a/l10n/ml/files_sharing.po
+++ b/l10n/ml/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ml/files_trashbin.po b/l10n/ml/files_trashbin.po
index 789bc95d80..f1318135dd 100644
--- a/l10n/ml/files_trashbin.po
+++ b/l10n/ml/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/ml/lib.po b/l10n/ml/lib.po
index a9665cfcf2..2cdf381a0a 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/ml/settings.po b/l10n/ml/settings.po
index 9c4432176c..96c2930a7d 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index bb6ef01bf7..f767519f1e 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/ml_IN/files.po b/l10n/ml_IN/files.po
index 452ed789cf..082b201245 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ml_IN/files_external.po b/l10n/ml_IN/files_external.po
index e8334604a6..f340ef292a 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: ml_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ml_IN/files_sharing.po b/l10n/ml_IN/files_sharing.po
index 80de277fc2..3ae42065ea 100644
--- a/l10n/ml_IN/files_sharing.po
+++ b/l10n/ml_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: ml_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ml_IN/files_trashbin.po b/l10n/ml_IN/files_trashbin.po
index 87bb8f5963..bd29963cdb 100644
--- a/l10n/ml_IN/files_trashbin.po
+++ b/l10n/ml_IN/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/ml_IN/lib.po b/l10n/ml_IN/lib.po
index 89380c67c3..dd7a8cfe4a 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: ml_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po
index 0e584edd60..95d2aae47c 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/mn/core.po b/l10n/mn/core.po
index c2ebf09969..47790d8c6d 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/mn/files.po b/l10n/mn/files.po
index 1a530ea9e1..e491e6a9e8 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/mn/files_external.po b/l10n/mn/files_external.po
index 7547f3512d..4642a17575 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/mn/files_sharing.po b/l10n/mn/files_sharing.po
index d7cf1613bb..629410fa58 100644
--- a/l10n/mn/files_sharing.po
+++ b/l10n/mn/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/mn/files_trashbin.po b/l10n/mn/files_trashbin.po
index 999826e02f..52bd47e622 100644
--- a/l10n/mn/files_trashbin.po
+++ b/l10n/mn/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/mn/lib.po b/l10n/mn/lib.po
index f0985c92ea..430ed15852 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/mn/settings.po b/l10n/mn/settings.po
index 5b2d9dcaf4..e986c08c1f 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index a54952683d..d86a9c0e03 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,202 +58,202 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Ahad"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Isnin"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Rabu"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Khamis"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Jumaat"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Januari"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februari"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Mac"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "April"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mei"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Jun"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Julai"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Ogos"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Disember"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Simpan..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Ya"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Tidak"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Batal"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -285,12 +285,12 @@ msgstr ""
 msgid "Share"
 msgstr "Kongsi"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Ralat"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -318,107 +318,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Kata laluan"
-
-#: 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Amaran"
 
@@ -662,6 +671,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "buat <strong>akaun admin</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Kata laluan"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index d42cd65699..c00de70a99 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Fail-fail"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Muatnaik dibatalkan."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,128 +177,132 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Kongsi"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Namakan"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Ralat"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Dalam proses"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Ralat"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nama"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Saiz"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Dimodifikasi"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nama"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Saiz"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Dimodifikasi"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -331,68 +339,75 @@ msgstr "Saiz maksimum input untuk fail ZIP"
 msgid "Save"
 msgstr "Simpan"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Baru"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Fail teks"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Batal muat naik"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Padam"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Muatnaik terlalu besar"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Fail sedang diimbas, harap bersabar."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Imbasan semasa"
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index 0495b5d172..417c492c92 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Lokasi"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Nama pengguna"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Kata laluan"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Kongsi"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index b0a17e9ba3..6eb142f93b 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Muat turun"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index 9c95c7b8f1..e2c6d9ac0b 100644
--- a/l10n/ms_MY/files_trashbin.po
+++ b/l10n/ms_MY/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Tidak dapat menghapuskan %s secara kekal"
 msgid "Couldn't restore %s"
 msgstr "Tidak dapat memulihkan %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Ralat"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Fail Dihapus"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "dipulihkan"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Tiada apa disini. Tong sampah anda kosong!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nama"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Pulihkan"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Ralat"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "dipulihkan"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Tiada apa disini. Tong sampah anda kosong!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nama"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Dihapuskan"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Padam"
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 7def985584..924f840c67 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "Perkhidmatan web di bawah kawalan anda"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 0fb7bf7d85..9a319b53cb 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Emel disimpan"
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Bahasa diubah"
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr "Kemaskini"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "dihapus"
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "_nama_bahasa_"
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Alamat pelayan"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Tahap Log"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Lanjutan"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr "Bahasa"
 msgid "Help translate"
 msgstr "Bantu terjemah"
 
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Log masuk"
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index aab3d0e877..be1b3a2760 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Ralat"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -142,7 +142,7 @@ msgstr[0] ""
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:984
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 3d2f6e540d..256f2f2f5a 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,202 +58,202 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "ဇန်နဝါရီ"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "ဖေဖော်ဝါရီ"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "မတ်"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "ဧပြီ"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "မေ"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "ဇွန်"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "ဇူလိုင်"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "ဩဂုတ်"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "စက်တင်ဘာ"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "အောက်တိုဘာ"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "နိုဝင်ဘာ"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "ဒီဇင်ဘာ"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "စက္ကန့်အနည်းငယ်က"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "ယနေ့"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "မနေ့က"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "ပြီးခဲ့သောလ"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "မနှစ်က"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "နှစ် အရင်က"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "ရွေးချယ်"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "ဟုတ်"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "မဟုတ်ဘူး"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "ရွေးချယ်"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "အိုကေ"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "ပယ်ဖျက်မည်"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -285,12 +285,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -318,107 +318,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "စကားဝှက်"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "အီးမေးလ်ဖြင့်ဝေမျှမည် -"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "ပြင်ဆင်နိုင်"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "ဖန်တီးမည်"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "ဖျက်မည်"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "ဝေမျှမည်"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -662,6 +671,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "စကားဝှက်"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index b02ef38781..ec5a41b307 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "ဖိုင်များ"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,128 +177,132 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -331,68 +339,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "ဒေါင်းလုတ်"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/my_MM/files_external.po b/l10n/my_MM/files_external.po
index ba5148a574..26f3f635b7 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "တည်နေရာ"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "သုံးစွဲသူအမည်"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "စကားဝှက်"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index 42a6c8a77b..7e19305cb7 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "ဒေါင်းလုတ်"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/my_MM/files_trashbin.po b/l10n/my_MM/files_trashbin.po
index db27619e26..3e84868cbd 100644
--- a/l10n/my_MM/files_trashbin.po
+++ b/l10n/my_MM/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index 95f11d4383..8fa18f36fc 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP ဒေါင်းလုတ်ကိုပိတ်ထားသည်"
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "ဖိုင်များသည် တစ်ခုပြီး တစ်ခုဒေါင်းလုတ်ချရန်လိုအပ်သည်"
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "ဖိုင်သို့ပြန်သွားမည်"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "zip ဖိုင်အဖြစ်ပြုလုပ်ရန် ရွေးချယ်ထားသောဖိုင်များသည် အရမ်းကြီးလွန်းသည်"
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "\"%s\"ခေါင်းစဉ်ကို ရှာမတွေ့ပါ"
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index bbbe692ecc..eb66e57c7a 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index fa01baccda..c2bb822b89 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-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -142,7 +142,7 @@ msgstr[0] ""
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:984
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 4ebea6e5d8..69c56f33ee 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -62,207 +62,207 @@ msgstr "Foreløpig profilbilde ikke tilgjengelig. Prøv igjen"
 msgid "No crop data provided"
 msgstr "Ingen beskjæringsinformasjon angitt"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Søndag"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Mandag"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "April"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "August"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Lagrer..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minutt siden"
 msgstr[1] "%n minutter siden"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n time siden"
 msgstr[1] "%n timer siden"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag siden"
 msgstr[1] "%n dager siden"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "forrige måned"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n dag siden"
 msgstr[1] "%n dager siden"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "i fjor"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "år siden"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Velg"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Feil ved lasting av filvelger-mal: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nei"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Velg"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Feil ved lasting av filvelger-mal: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Feil ved lasting av meldingsmal: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} filkonflikt"
 msgstr[1] "{count} filkonflikter"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "En filkonflikt"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Hvilke filer vil du beholde?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Fortsett"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(alle valgt)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} valgt)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Feil ved lasting av \"filen eksisterer\"-mal"
 
@@ -294,12 +294,12 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Feil"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Feil under deling"
 
@@ -327,107 +327,116 @@ msgstr "Del med bruker eller gruppe …"
 msgid "Share link"
 msgstr "Del lenke"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passord"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Tillat Offentlig Opplasting"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Email lenke til person"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Set utløpsdato"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Utløpsdato"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Del på epost"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Ingen personer funnet"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "gruppe"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Videredeling er ikke tillatt"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "Varsle på email"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "kan endre"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "opprett"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "del"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Feil ved nullstilling av utløpsdato"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Kan ikke sette utløpsdato"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Sender..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "E-post sendt"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -671,6 +680,10 @@ msgstr "For informasjon om hvordan du setter opp serveren din riktig, se <a href
 msgid "Create an <strong>admin account</strong>"
 msgstr "opprett en <strong>administrator-konto</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passord"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Lagring og database"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index e01523ab83..56dd3f8593 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -31,7 +31,7 @@ msgstr "Kan ikke flytte %s - En fil med samme navn finnes allerede"
 msgid "Could not move %s"
 msgstr "Kunne ikke flytte %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Filnavn kan ikke være tomt."
 
@@ -40,18 +40,18 @@ msgstr "Filnavn kan ikke være tomt."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -143,28 +143,32 @@ msgstr "Opplasting feilet. Klarte ikke å finne informasjon om fil."
 msgid "Invalid directory."
 msgstr "Ugyldig katalog."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Filer"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Kan ikke laste opp {filename} fordi det er en mappe eller har 0 bytes"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Opplasting avbrutt."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Fikk ikke resultat fra serveren."
 
@@ -177,131 +181,135 @@ msgstr "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen."
 msgid "URL cannot be empty"
 msgstr "URL kan ikke være tom"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} finnes allerede"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Klarte ikke å opprette fil"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Klarte ikke å opprette mappe"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Feil ved henting av URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Del"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Slett permanent"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Gi nytt navn"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Feil ved flytting av fil"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Feil"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Ventende"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Feil ved flytting av fil"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Feil"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Klarte ikke å gi nytt navn til fil"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Feil ved sletting av fil."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Navn"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Størrelse"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Endret"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappe"
 msgstr[1] "%n mapper"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
 msgstr[1] "%n filer"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} og {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Laster opp %n fil"
 msgstr[1] "Laster opp %n filer"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen."
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "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:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} og {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Navn"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Størrelse"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Endret"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "Kunne ikke gi nytt navn til %s"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -338,68 +346,75 @@ msgstr "Maksimal størrelse på ZIP-filer"
 msgid "Save"
 msgstr "Lagre"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Ny tekstfil"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Tekstfil"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Mappe"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Fra link"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Slettede filer"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last opp noe!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Filen er for stor"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Skanner filer, vennligst vent."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Pågående skanning"
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 7e1d6afab9..4c34fa7699 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Hans Nesse <>, 2013
+# dizzi90 <dizzi90@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-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -18,6 +19,166 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Lokal"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Sted"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Tjener"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Brukernavn"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Passord"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Del"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Tilgang innvilget"
@@ -42,29 +203,29 @@ msgstr "Feil med konfigurering av Google Drive"
 msgid "Saved"
 msgstr "Lagret"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>Notat:</b> "
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
-msgstr ""
+msgstr "og"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 ""
+msgstr "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Montering av %s er ikke mulig. Be systemadministratoren om å installere det."
 
-#: lib/config.php:626
+#: lib/config.php:623
 #, 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 ""
+msgstr "<b>Merk:</b> FTP støtte i PHP er ikke slått på eller innstallert. Kan ikke montere %s. Ta kontakt med din systemadministrator for å installere det."
 
-#: lib/config.php:628
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -93,7 +254,7 @@ msgstr "Innstillinger"
 
 #: templates/settings.php:12
 msgid "Available for"
-msgstr ""
+msgstr "Tilgjengelig for"
 
 #: templates/settings.php:32
 msgid "Add storage"
@@ -101,7 +262,7 @@ msgstr "Legg til lagringsplass"
 
 #: templates/settings.php:92
 msgid "No user or group"
-msgstr ""
+msgstr "Ingen bruker eller gruppe"
 
 #: templates/settings.php:95
 msgid "All Users"
@@ -126,7 +287,7 @@ msgstr "Aktiver ekstern lagring for bruker"
 
 #: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Tillat brukere å montere følgende eksterne lagring"
 
 #: templates/settings.php:150
 msgid "SSL root certificates"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index 6f1948eeb7..ccfe56e2a5 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -19,7 +19,7 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Delt av {owner}"
 
@@ -59,16 +59,15 @@ msgstr "deling er deaktivert"
 msgid "For more info, please ask the person who sent this link."
 msgstr "For mer informasjon, spør personen som sendte lenken."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "delt av %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Last ned"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Direkte lenke"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index 8647b1afb9..dcb28e1ad1 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -29,38 +29,34 @@ msgstr "Kunne ikke slette %s fullstendig"
 msgid "Couldn't restore %s"
 msgstr "Kunne ikke gjenopprette %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Slettede filer"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Feil"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Slettede filer"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "gjenopprettet"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Ingenting her. Søppelkassen din er tom!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Navn"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Gjenopprett"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Feil"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "gjenopprettet"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Ingenting her. Søppelkassen din er tom!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Navn"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Slettet"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Slett"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 6979989c40..08f22d8c92 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -19,12 +19,15 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -75,23 +78,23 @@ msgstr "Ugyldig bilde"
 msgid "web services under your control"
 msgstr "web tjenester du kontrollerer"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP-nedlasting av avslått"
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Filene må lastes ned en om gangen"
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Tilbake til filer"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "De valgte filene er for store til å kunne generere ZIP-fil"
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -277,19 +280,19 @@ msgstr "Sett et admin-brukernavn."
 msgid "Set an admin password."
 msgstr "Sett et admin-passord."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s delte »%s« med deg"
@@ -331,73 +334,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Kunne ikke finne kategori \"%s\""
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index ed7e4dfa99..9b1621d781 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -102,6 +102,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Epost lagret"
@@ -118,6 +128,16 @@ msgstr "Kan ikke slette gruppe"
 msgid "Unable to delete user"
 msgstr "Kan ikke slette bruker"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Språk endret"
@@ -173,7 +193,7 @@ msgstr "Serveren støtter ikke endring av passord, men oppdatering av brukerens
 msgid "Unable to change password"
 msgstr "Kunne ikke endre passord"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Sender..."
 
@@ -229,34 +249,42 @@ msgstr "Oppdater"
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Velg et profilbilde"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Veldig svakt passord"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Svakt passord"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Bra passord"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Sterkt passord"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dekrypterer filer... Vennligst vent, dette kan ta litt tid."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "slettet"
@@ -302,7 +330,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -490,148 +518,143 @@ msgstr "Tillat apps å bruke API for Deling"
 msgid "Allow links"
 msgstr "Tillat lenker"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Tillat offentlig opplasting"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "TIllat videredeling"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Tillat brukere å dele med alle"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Tillat påminnelser i e-post"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Tillat brukere å dele filer offentlig med lenker"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "TIllat videredeling"
+
+#: templates/admin.php:253
+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:260
+msgid "Allow users to share with anyone"
+msgstr "Tillat brukere å dele med alle"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "Tillat kun deling med andre brukere i samme gruppe"
+
 #: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
+msgstr "Tillat påminnelser i e-post"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Tving HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Fra adresse"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Server-adresse"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "SMTP-brukernavn"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "SMTP-passord"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Send e-post"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Loggnivå"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versjon"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -784,29 +807,33 @@ msgstr "Språk"
 msgid "Help translate"
 msgstr "Bidra til oversettelsen"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Innloggingspassord"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Dekrypter alle filer"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Logginn navn"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 229c35dc6a..a670f1404e 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -87,65 +87,65 @@ msgstr "Suksess"
 msgid "Error"
 msgstr "Feil"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfigurasjon OK"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Konfigurasjon feil"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Konfigurasjon ufullstendig"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Velg grupper"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Velg objektklasser"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Velg attributter"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Tilkoblingstest lyktes"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Tilkoblingstest mislyktes"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Bekreft sletting"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s gruppe funnet"
 msgstr[1] "%s grupper funnet"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s bruker funnet"
 msgstr[1] "%s brukere funnet"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Ugyldig tjener"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Fant ikke den ønskede funksjonaliteten"
 
diff --git a/l10n/nds/core.po b/l10n/nds/core.po
index 9ce7cea032..82306ef456 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/nds/files.po b/l10n/nds/files.po
index e7b2817c4f..7e0878bd55 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/nds/files_external.po b/l10n/nds/files_external.po
index 05dd53ee1c..1cf422057b 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: nds\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/nds/files_sharing.po b/l10n/nds/files_sharing.po
index 9db95efcab..d519385a8b 100644
--- a/l10n/nds/files_sharing.po
+++ b/l10n/nds/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: nds\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/nds/files_trashbin.po b/l10n/nds/files_trashbin.po
index 2ec4379ecc..641cc979b1 100644
--- a/l10n/nds/files_trashbin.po
+++ b/l10n/nds/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/nds/lib.po b/l10n/nds/lib.po
index 7b5bc15867..06d52c39d9 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: nds\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/nds/settings.po b/l10n/nds/settings.po
index aca2bdf583..56d10923eb 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index eccb815609..48cac554de 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index b788633a4c..43efc9a9fe 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ne/files_external.po b/l10n/ne/files_external.po
index 7e38ed50b9..8815be2add 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ne/files_sharing.po b/l10n/ne/files_sharing.po
index d363ca3ea7..491d20507b 100644
--- a/l10n/ne/files_sharing.po
+++ b/l10n/ne/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ne/files_trashbin.po b/l10n/ne/files_trashbin.po
index b964888914..b6bc61076e 100644
--- a/l10n/ne/files_trashbin.po
+++ b/l10n/ne/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index b2d62c5b52..adec777798 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index c232c9c8c4..83206c1419 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index f79ca47c00..ecce78fae6 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # André Koot <meneer@tken.net>, 2013-2014
-# kwillems <kwillems@zonnet.nl>, 2013
+# kwillems <kwillems@zonnet.nl>, 2013-2014
 # Jorcee <mail@jordyc.nl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -61,207 +61,207 @@ msgstr "Geen tijdelijke profielafbeelding beschikbaar. Probeer het opnieuw"
 msgid "No crop data provided"
 msgstr "Geen bijsnijdingsgegevens opgegeven"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "zondag"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "maandag"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "dinsdag"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "woensdag"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "donderdag"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "vrijdag"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "zaterdag"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "januari"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "februari"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "maart"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "april"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "mei"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "juni"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "juli"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "augustus"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "september"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "oktober"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "november"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "december"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Opslaan"
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "seconden geleden"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "%n minuten geleden"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] "%n uur geleden"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "vandaag"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "gisteren"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] "%n dagen geleden"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "vorige maand"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] "%n maanden geleden"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "vorig jaar"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "jaar geleden"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Kies"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Fout bij laden bestandenselecteur sjabloon: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nee"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Kies"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Fout bij laden bestandenselecteur sjabloon: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Fout bij laden berichtensjabloon: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} bestandsconflict"
 msgstr[1] "{count} bestandsconflicten"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Een bestandsconflict"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Nieuwe bestanden"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Al aanwezige bestanden"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Welke bestanden wilt u bewaren?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Verder"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(alles geselecteerd)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} geselecteerd)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Fout bij laden bestand bestaat al sjabloon"
 
@@ -293,12 +293,12 @@ msgstr "Gedeeld"
 msgid "Share"
 msgstr "Delen"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Fout"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Fout tijdens het delen"
 
@@ -326,107 +326,116 @@ msgstr "Delen met gebruiker of groep ..."
 msgid "Share link"
 msgstr "Deel link"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken"
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr "Standaard vervalt een openbare link na {days} dagen"
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Wachtwoord beveiligd"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Wachtwoord"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Sta publieke uploads toe"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "E-mail link naar persoon"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Versturen"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Stel vervaldatum in"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Vervaldatum"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Deel via e-mail:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Geen mensen gevonden"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "groep"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Verder delen is niet toegestaan"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Gedeeld in {item} met {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Stop met delen"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "melden per e-mail"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "kan wijzigen"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "toegangscontrole"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "creëer"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "bijwerken"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "verwijderen"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "deel"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Wachtwoord beveiligd"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
-msgstr "Fout tijdens het verwijderen van de verval datum"
+msgstr "Fout tijdens het verwijderen van de vervaldatum"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Fout tijdens het instellen van de vervaldatum"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Versturen ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "E-mail verzonden"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Waarschuwing"
 
@@ -467,11 +476,11 @@ msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+msgstr "De update is niet geslaagd. Meld dit probleem bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
 
 #: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud."
+msgstr "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud."
 
 #: lostpassword/controller.php:70
 #, php-format
@@ -486,22 +495,22 @@ msgstr "Er ontstond een probleem bij het versturen van het e-mailbericht, neem c
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
-msgstr "Gebruik de volgende link om je wachtwoord te resetten: {link}"
+msgstr "Gebruik de volgende link om uw wachtwoord te resetten: {link}"
 
 #: lostpassword/templates/lostpassword.php:7
 msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr "De link voor het resetten van je wachtwoord is verzonden naar je e-mailadres.<br>Als je dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan je beheerder om te helpen."
+msgstr "De link voor het resetten van uw wachtwoord is verzonden naar uw e-mailadres.<br>Als u dat bericht niet snel ontvangen hebt, controleer dan uw spammap.<br>Als het daar ook niet is, vraag dan uw beheerder om hulp."
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoord goed waren?"
+msgstr "Aanvraag mislukt!<br>Weet u zeker dat uw gebruikersnaam en/of wachtwoord goed waren?"
 
 #: lostpassword/templates/lostpassword.php:18
 msgid "You will receive a link to reset your password via Email."
-msgstr "Je ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail."
+msgstr "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail."
 
 #: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
 #: templates/login.php:32
@@ -514,7 +523,7 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr "Je bestanden zijn versleuteld. Als je geen recoverykey hebt ingeschakeld is er geen manier om je data terug te krijgen indien je je wachtwoord reset!\nAls je niet weet wat te doen, neem dan alsjeblieft contact op met je administrator eer je doorgaat.\nWil je echt doorgaan?"
+msgstr "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?"
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Yes, I really want to reset my password now"
@@ -526,7 +535,7 @@ msgstr "Reset"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "Je wachtwoord is gewijzigd"
+msgstr "Uw wachtwoord is gewijzigd"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
@@ -616,7 +625,7 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr "Hallo daar,\n\neven een berichtje dat %s %s met u deelde.\nBekijk het: %s\n\n"
+msgstr "Hallo,\n\n%s deelt %s met u.\nBekijk het: %s\n\n"
 
 #: templates/altmail.php:4 templates/mail.php:17
 #, php-format
@@ -634,7 +643,7 @@ msgstr "Beveiligingswaarschuwing"
 
 #: templates/installation.php:26
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)"
+msgstr "Uw PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)"
 
 #: templates/installation.php:27
 #, php-format
@@ -657,7 +666,7 @@ msgstr "Zonder random nummer generator is het mogelijk voor een aanvaller om de
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet werkt."
+msgstr "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert."
 
 #: templates/installation.php:42
 #, php-format
@@ -670,6 +679,10 @@ msgstr "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informa
 msgid "Create an <strong>admin account</strong>"
 msgstr "Maak een <strong>beheerdersaccount</strong> aan"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Wachtwoord"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Opslag & database"
@@ -719,7 +732,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 "Deze applicatie heeft een werkend JavaScript nodig.  <a href=\"http://enable-javascript.com/\" target=\"_blank\">activeer JavaScript</a> en herlaad deze interface."
+msgstr "Deze applicatie heeft JavaScript nodig om correct te functioneren.  <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeer JavaScript</a> en herlaad deze interface."
 
 #: templates/layout.user.php:44
 #, php-format
@@ -738,11 +751,11 @@ msgstr "Automatische aanmelding geweigerd!"
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overgenomen zijn!"
+msgstr "Als u uw wachtwoord niet onlangs heeft aangepast, kan uw account overgenomen zijn!"
 
 #: templates/login.php:12
 msgid "Please change your password to secure your account again."
-msgstr "Wijzig je wachtwoord zodat je account weer beveiligd is."
+msgstr "Wijzig uw wachtwoord zodat uw account weer beveiligd is."
 
 #: templates/login.php:17
 msgid "Server side authentication failed!"
@@ -762,7 +775,7 @@ msgstr "onthoud gegevens"
 
 #: templates/login.php:54
 msgid "Log in"
-msgstr "Meld je aan"
+msgstr "Meld u aan"
 
 #: templates/login.php:60
 msgid "Alternative Logins"
@@ -773,7 +786,7 @@ msgstr "Alternatieve inlogs"
 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 "Hallo daar,<br><br>we willen even laten weten dat %s <strong>%s</strong> met u heeft gedeeld.<br><a href=\"%s\">Bekijk het!</a><br><br>"
+msgstr "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk het!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 5f9e9f93c4..543bb6d148 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -29,7 +29,7 @@ msgstr "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam"
 msgid "Could not move %s"
 msgstr "Kon %s niet verplaatsen"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Bestandsnaam kan niet leeg zijn."
 
@@ -38,18 +38,18 @@ msgstr "Bestandsnaam kan niet leeg zijn."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" is een ongeldige bestandsnaam."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "De doelmap is verplaatst of verwijderd."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -141,28 +141,32 @@ msgstr "Upload mislukt, Kon geen bestandsinfo krijgen."
 msgid "Invalid directory."
 msgstr "Ongeldige directory."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Bestanden"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 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:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Uploaden geannuleerd."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Kon het resultaat van de server niet terugkrijgen."
 
@@ -175,131 +179,135 @@ msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de u
 msgid "URL cannot be empty"
 msgstr "URL mag niet leeg zijn"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} bestaat al"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Kon bestand niet creëren"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Kon niet creëren map"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Fout bij ophalen URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Delen"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Verwijder definitief"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Hernoem"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Fout bij verplaatsen bestand"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Fout"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "In behandeling"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Fout bij verplaatsen bestand"
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Fout bij verplaatsen bestand"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Fout"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Kon niet hernoemen bestand"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Fout bij verwijderen bestand."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Naam"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Grootte"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Aangepast"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] "%n mappen"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] "%n bestanden"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} en {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n bestand aan het uploaden"
 msgstr[1] "%n bestanden aan het uploaden"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" is een ongeldige bestandsnaam."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in."
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Ongeldige privésleutel voor crypto app. Werk het privésleutel wachtwoord bij in uw persoonlijke instellingen om opnieuw toegang te krijgen tot uw versleutelde bestanden."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} en {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Naam"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Grootte"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Aangepast"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s kon niet worden hernoemd"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Upload (max. %s)"
@@ -336,68 +344,75 @@ msgstr "Maximale grootte voor ZIP bestanden"
 msgid "Save"
 msgstr "Bewaren"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Nieuw"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Nieuw tekstbestand"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Tekstbestand"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Map"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Vanaf link"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Verwijderde bestanden"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Upload afbreken"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Er bevindt zich hier niets. Upload een bestand!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Downloaden"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Verwijder"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Upload is te groot"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Bestanden worden gescand, even wachten."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Er wordt gescand"
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index 92ecf69764..50ff05f11b 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/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-04-11 01:54-0400\n"
-"PO-Revision-Date: 2014-04-10 06:50+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,166 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Lokaal"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Locatie"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Sleutel"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Geheim"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr "Bucket"
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr "Amazon S3 en overeenkomstig"
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "Access Key"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Secret Key"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "Hostname (optioneel)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Poort (optioneel)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Regio (optioneel)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Activeren SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr "Activeren pad stijl"
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "App key"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr "App secret"
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Root"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "Secure ftps://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "Client ID"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr "Client secret"
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr "OpenStack Object Storage"
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Gebruikersnaam (verplicht)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr "Bucket (verplicht)"
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr "Regio (optioneel voor OpenStack Object Storage)"
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr "API Key (verplicht voor Rackspace Cloud Files)"
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr "Tenantname (Verplicht voor OpenStack Object Storage)"
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr "Wachtwoord (verplicht voor OpenStack Object Storage)"
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr "Service Name (verplicht voor OpenStack Object Storage)"
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr "URL van identity endpoint (verplicht voor OpenStack Object Storage)"
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr "Time-out van HTTP aanvragen in seconden (optioneel)"
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Share"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr "SMB / CIFS via OC inlog"
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr "Gebruikersnaam als share"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "Secure https://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "Externe submap"
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Toegang toegestaan"
@@ -42,29 +202,29 @@ msgstr "Fout tijdens het configureren van Google Drive opslag"
 msgid "Saved"
 msgstr "Bewaard"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Let op:</b> "
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr "en"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 "<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:626
+#: lib/config.php:623
 #, 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 "<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:628
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index e2bb03d4b8..99482488b9 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +19,7 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Gedeeld door {owner}"
 
@@ -59,16 +59,15 @@ msgstr "delen is uitgeschakeld"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "gedeeld door %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Downloaden"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Download %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Directe link"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index 17d352ef3b..4ab3b317b7 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Kon %s niet permanent verwijderen"
 msgid "Couldn't restore %s"
 msgstr "Kon %s niet herstellen"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Verwijderde bestanden"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Fout"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Verwijderde bestanden"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "hersteld"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Niets te vinden. Uw prullenbak is leeg!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Naam"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Herstellen"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Fout"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "hersteld"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Niets te vinden. Uw prullenbak is leeg!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Naam"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Verwijder"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index 6c0ccbbe5d..fc0049107b 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -20,13 +20,16 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
-msgstr ""
+msgstr "U benadert de server vanaf een niet vertrouwd domein."
 
-#: base.php:724
-msgid "Please contact your administrator"
-msgstr ""
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr "Neem contact op met uw beheerder. Als u de beheerder van deze service bent, configureer dan de \"trusted_domain\" instelling in config/config.php. Een voorbeeldconfiguratie is gegeven in config/config.sample.php."
 
 #: private/app.php:236
 #, php-format
@@ -76,23 +79,23 @@ msgstr "Ongeldige afbeelding"
 msgid "web services under your control"
 msgstr "Webdiensten in eigen beheer"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP download is uitgeschakeld."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Bestanden moeten één voor één worden gedownload."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Terug naar bestanden"
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -278,19 +281,19 @@ msgstr "Stel de gebruikersnaam van de beheerder in."
 msgid "Set an admin password."
 msgstr "Stel een beheerderswachtwoord in."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s deelde »%s« met jou"
@@ -298,107 +301,113 @@ msgstr "%s deelde »%s« met jou"
 #: private/share/share.php:498
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
+msgstr "Delen van %s is mislukt, omdat het bestand niet bestaat"
 
 #: private/share/share.php:523
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
-msgstr ""
+msgstr "Delen van %s is mislukt, omdat de gebruiker %s de eigenaar is"
 
 #: private/share/share.php:529
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
-msgstr ""
+msgstr "Delen van %s is mislukt, omdat gebruiker %s niet bestaat"
 
 #: private/share/share.php:538
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
-msgstr ""
+msgstr "Delen van %s is mislukt, omdat gebruiker %s geen lid is van een groep waar %s lid van is"
 
 #: private/share/share.php:551 private/share/share.php:579
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
-msgstr ""
+msgstr "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s"
 
 #: private/share/share.php:559
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
-msgstr ""
+msgstr "Delen van %s is mislukt, omdat groep %s niet bestaat"
 
 #: private/share/share.php:566
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr "Delen van %s is mislukt, omdat %s geen lid is van groep %s"
+
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
-msgstr ""
+msgstr "Delen van %s is mislukt, omdat het delen met links niet is toegestaan"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
-msgstr ""
+msgstr "Delen van type %s is niet geldig voor %s"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
-msgstr ""
+msgstr "Instellen van de permissies voor %s is mislukt, omdat de permissies hoger zijn dan de aan %s toegekende permissies"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
-msgstr ""
+msgstr "Instellen van de permissies voor %s is mislukt, omdat het object niet is gevonden"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
-msgstr ""
+msgstr "Het share-backend %s moet de OCP\\Share_Backend interface implementeren"
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
-msgstr ""
+msgstr "Het share-backend %s is niet gevonden"
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
-msgstr ""
+msgstr "Het share-backend voor %s is niet gevonden"
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
-msgstr ""
+msgstr "Delen van %s is mislukt, omdat gebruiker %s de originele deler is"
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
-msgstr ""
+msgstr "Delen van %s is mislukt, omdat de rechten de aan %s toegekende autorisaties overschrijden"
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
-msgstr ""
+msgstr "Delen van %s is mislukt, omdat her-delen niet is toegestaan"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
-msgstr ""
+msgstr "Delen van %s is mislukt, omdat de share-backend voor %s de bron niet kon vinden"
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
-msgstr ""
+msgstr "Delen van %s is mislukt, omdat het bestand niet in de bestandscache kon worden gevonden"
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Kon categorie \"%s\" niet vinden"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 9f4643db2f..ddbae94c0b 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Verstuurmodus"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Versleuteling"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Authenticatiemethode"
 
@@ -102,6 +102,16 @@ msgstr "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw"
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Cryptosleutels permanent verwijderd"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud.log, of neem contact op met uw beheerder."
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "E-mail bewaard"
@@ -118,6 +128,16 @@ msgstr "Niet in staat om groep te verwijderen"
 msgid "Unable to delete user"
 msgstr "Niet in staat om gebruiker te verwijderen"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Backup succesvol terggezet"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Kon uw cryptosleutels niet herstellen. Controleer uw owncloud.log of neem contact op met uw beheerder"
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Taal aangepast"
@@ -173,7 +193,7 @@ msgstr "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleute
 msgid "Unable to change password"
 msgstr "Kan wachtwoord niet wijzigen"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Versturen..."
 
@@ -229,34 +249,42 @@ msgstr "Bijwerken"
 msgid "Updated"
 msgstr "Bijgewerkt"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Kies een profielafbeelding"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Zeer zwak wachtwoord"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Zwak wachtwoord"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Matig wachtwoord"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Goed wachtwoord"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Sterk wachtwoord"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "verwijderd"
@@ -302,7 +330,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Nederlands"
 
@@ -490,148 +518,143 @@ msgstr "Apps toestaan de Share API te gebruiken"
 msgid "Allow links"
 msgstr "Toestaan links"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Sta publieke uploads toe"
 
-#: 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:230
+msgid "Set default expiration date"
+msgstr "Stel standaard vervaldatum in"
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr "Vervalt na"
 
 #: templates/admin.php:235
+msgid "days"
+msgstr "dagen"
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr "Verplicht de vervaldatum"
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Toestaan dat gebruikers objecten met links delen met anderen"
+
+#: templates/admin.php:252
 msgid "Allow resharing"
 msgstr "Toestaan opnieuw delen"
 
-#: templates/admin.php:236
+#: templates/admin.php:253
 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:243
+#: templates/admin.php:260
 msgid "Allow users to share with anyone"
 msgstr "Toestaan dat gebruikers met iedereen delen"
 
-#: templates/admin.php:246
+#: templates/admin.php:263
 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:253
+#: templates/admin.php:270
 msgid "Allow mail notification"
 msgstr "Toestaan e-mailnotificaties"
 
-#: templates/admin.php:254
+#: templates/admin.php:271
 msgid "Allow users to send mail notification for shared files"
 msgstr "Sta gebruikers toe om e-mailnotificaties  te versturen voor gedeelde bestanden"
 
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
-
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Beveiliging"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Afdwingen HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "E-mailserver"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Dit wordt gestuurd voor het verzenden van meldingen."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Afzenderadres"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Authenticatie vereist"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Server adres"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Poort"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Inloggegevens"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "SMTP gebruikersnaam"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "SMTP wachtwoord"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Test e-mailinstellingen"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Versturen e-mail"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Meer"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Minder"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versie"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -784,29 +807,33 @@ msgstr "Taal"
 msgid "Help translate"
 msgstr "Help met vertalen"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Inlog-wachtwoord"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Decodeer alle bestanden"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Uw cryptosleutels zijn verplaatst naar een backup locatie. Als iets iets verkeerd ging, kunt u de sleutels herstellen. Verwijder ze alleen permanent als u zeker weet dat de bestanden goed zijn versleuteld."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Herstel cryptosleutels"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Verwijder cryptosleutels"
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Inlognaam"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 261fbf9145..d30ac05c60 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -89,65 +89,65 @@ msgstr "Succes"
 msgid "Error"
 msgstr "Fout"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuratie OK"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Configuratie onjuist"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Configuratie incompleet"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Selecteer groepen"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Selecteer objectklasse"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Selecteer attributen"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Verbindingstest geslaagd"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Verbindingstest mislukt"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Bevestig verwijderen"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s groep gevonden"
 msgstr[1] "%s groepen gevonden"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s gebruiker gevonden"
 msgstr[1] "%s gebruikers gevonden"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Ongeldige server"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Kon de gewenste functie niet vinden"
 
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index ad0c0b9813..13b13087ab 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # unhammer <unhammer+dill@mm.st>, 2013
+# brekkjen <leif.brekke@oppstryn.no>, 2014
 # unhammer <unhammer+dill@mm.st>, 2013
 # unhammer <unhammer+dill@mm.st>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +28,7 @@ msgstr ""
 #: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
-msgstr ""
+msgstr "Kunne ikkje snede e-post til følgande brukarar: %s "
 
 #: ajax/update.php:10
 msgid "Turned on maintenance mode"
@@ -61,207 +62,207 @@ msgstr "Inga midlertidig profilbilete tilgjengeleg, prøv igjen"
 msgid "No crop data provided"
 msgstr "Ingen beskjeringsdata gitt"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Søndag"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Måndag"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Tysdag"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "April"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "August"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Lagrar …"
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "sekund sidan"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minutt sidan"
 msgstr[1] "%n minutt sidan"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n time sidan"
 msgstr[1] "%n timar sidan"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag sidan"
 msgstr[1] "%n dagar sidan"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "førre månad"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n månad sidan"
 msgstr[1] "%n månadar sidan"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "i fjor"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "år sidan"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Vel"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Klarte ikkje å lasta filplukkarmal: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nei"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Vel"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Klarte ikkje å lasta filplukkarmal: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Greitt"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Klarte ikkje å lasta meldingsmal: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} filkonflikt"
 msgstr[1] "{count} filkonfliktar"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Éin filkonflikt"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Kva filer vil du spara?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Gå vidare"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(alle valte)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} valte)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Klarte ikkje å lasta fil-finst-mal"
 
@@ -293,12 +294,12 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Feil"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Feil ved deling"
 
@@ -326,107 +327,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Passordvern"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passord"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Tillat offentleg opplasting"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Send lenkja over e-post"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Set utløpsdato"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Utløpsdato"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Del over e-post:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Fann ingen personar"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "gruppe"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Vidaredeling er ikkje tillate"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {brukar}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Udel"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "kan endra"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "lag"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "del"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Passordverna"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Klarte ikkje fjerna utløpsdato"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Klarte ikkje setja utløpsdato"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Sender …"
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "E-post sendt"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Åtvaring"
 
@@ -670,6 +680,10 @@ msgstr "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> f
 msgid "Create an <strong>admin account</strong>"
 msgstr "Lag ein <strong>admin-konto</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passord"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 3eeb614380..9783aeb71b 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -30,7 +30,7 @@ msgstr "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet"
 msgid "Could not move %s"
 msgstr "Klarte ikkje flytta %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Filnamnet kan ikkje vera tomt."
 
@@ -39,18 +39,18 @@ msgstr "Filnamnet kan ikkje vera tomt."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -142,28 +142,32 @@ msgstr "Feil ved opplasting. Klarte ikkje å henta filinfo."
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Filer"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte."
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Opplasting avbroten."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Klarte ikkje å henta resultat frå tenaren."
 
@@ -176,131 +180,135 @@ msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbrot
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} finst allereie"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Del"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Slett for godt"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Endra namn"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Feil ved flytting av fil"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Feil"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Under vegs"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Feil ved flytting av fil"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Feil"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Namn"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Storleik"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Endra"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappe"
 msgstr[1] "%n mapper"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
 msgstr[1] "%n filer"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} og {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Lastar opp %n fil"
 msgstr[1] "Lastar opp %n filer"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Lagringa di er nesten full ({usedSpacePercent} %)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} og {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Namn"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Storleik"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Endra"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "Klarte ikkje å omdøypa på %s"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -337,68 +345,75 @@ msgstr "Maksimal storleik for ZIP-filer"
 msgid "Save"
 msgstr "Lagre"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Tekst fil"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
-msgstr ""
+msgstr "Ny mappe"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Mappe"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Frå lenkje"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Sletta filer"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last noko opp!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "For stor opplasting"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Skannar filer, ver venleg og vent."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Køyrande skanning"
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index b759063902..bdc7acabd5 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -17,6 +17,166 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Stad"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Tenar"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Brukarnamn"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Passord"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Del"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "Nettstad"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -76,7 +236,7 @@ msgstr ""
 
 #: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
-msgstr ""
+msgstr "Mappenamn"
 
 #: templates/settings.php:9
 msgid "External storage"
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 597087b12b..c9d03bc9c3 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:20+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Delt av {owner}"
 
@@ -58,16 +58,15 @@ msgstr "deling er slått av"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Spør den som sende deg lenkje om du vil ha meir informasjon."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr ""
+#: templates/public.php:21
+msgid "Download"
+msgstr "Last ned"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index ab286c9bb3..493249fc69 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -29,38 +29,34 @@ msgstr "Klarte ikkje sletta %s for godt"
 msgid "Couldn't restore %s"
 msgstr "Klarte ikkje gjenoppretta %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Sletta filer"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Feil"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Sletta filer"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "gjenoppretta"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Ingenting her. Papirkorga di er tom!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Namn"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Gjenopprett"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Feil"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "gjenoppretta"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Ingenting her. Papirkorga di er tom!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Namn"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Sletta"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Slett"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index b21742c6dc..e01227fda4 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -19,12 +19,15 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -75,23 +78,23 @@ msgstr "Ugyldig bilete"
 msgid "web services under your control"
 msgstr "Vev tjenester under din kontroll"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -277,19 +280,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s delte «%s» med deg"
@@ -331,73 +334,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 9553225cb0..f6790aa49b 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -101,6 +101,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "E-postadresse lagra"
@@ -117,6 +127,16 @@ msgstr "Klarte ikkje å sletta gruppa"
 msgid "Unable to delete user"
 msgstr "Klarte ikkje sletta brukaren"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Språk endra"
@@ -172,7 +192,7 @@ msgstr "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til b
 msgid "Unable to change password"
 msgstr "Klarte ikkje å endra passordet"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -228,34 +248,42 @@ msgstr "Oppdater"
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Vel eit profilbilete"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "sletta"
@@ -301,7 +329,7 @@ msgstr "Du må oppgje eit gyldig passord"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Nynorsk"
 
@@ -489,148 +517,143 @@ msgstr "La app-ar bruka API-et til deling"
 msgid "Allow links"
 msgstr "Tillat lenkjer"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Tillat offentlege opplastingar"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Tillat vidaredeling"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "La brukarar vidaredela delte ting"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "La brukarar dela med kven som helst"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "La brukarar dela ting offentleg med lenkjer"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Tillat vidaredeling"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "La brukarar vidaredela delte ting"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "La brukarar dela med kven som helst"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "La brukarar dela berre med brukarar i deira grupper"
+
 #: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Tryggleik"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Krev HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Tenaradresse"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Log nivå"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Meir"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Utgåve"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -783,29 +806,33 @@ msgstr "Språk"
 msgid "Help translate"
 msgstr "Hjelp oss å omsetja"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Innloggingspassord"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Dekrypter alle filene"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Innloggingsnamn"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 658356c58e..4762e0528e 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -86,65 +86,65 @@ msgstr ""
 msgid "Error"
 msgstr "Feil"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Vel grupper"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po
index 654b95dd28..05111949f1 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,202 +58,202 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -285,12 +285,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -318,107 +318,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -662,6 +671,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/nqo/files.po b/l10n/nqo/files.po
index c602a04290..f32073f8d0 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,128 +177,132 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -331,68 +339,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/nqo/files_external.po b/l10n/nqo/files_external.po
index 12b0618ce1..6331f53f10 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: nqo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/nqo/files_sharing.po b/l10n/nqo/files_sharing.po
index c1f02996c6..ca3371aeaf 100644
--- a/l10n/nqo/files_sharing.po
+++ b/l10n/nqo/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: nqo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/nqo/files_trashbin.po b/l10n/nqo/files_trashbin.po
index bd77f4c205..440e5fd8b3 100644
--- a/l10n/nqo/files_trashbin.po
+++ b/l10n/nqo/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/nqo/lib.po b/l10n/nqo/lib.po
index d156c452f5..5ea621b28e 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: nqo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/nqo/settings.po b/l10n/nqo/settings.po
index 57d51e3891..e7a702765c 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index fada975324..076e252fbd 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Dimenge"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Diluns"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Dimarç"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Dijòus"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Divendres"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "genièr"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "febrièr"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "març"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "abril"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "mai"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "junh"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "julhet"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "agost"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "septembre"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "octobre"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Novembre"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Decembre"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Configuracion"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Enregistra..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "segonda a"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "uèi"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "ièr"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "mes passat"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "an passat"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "ans a"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Causís"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Òc"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Non"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Causís"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "D'accòrdi"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Annula"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr "Parteja"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Error al partejar"
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Parat per senhal"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Senhal"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Met la data d'expiracion"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Data d'expiracion"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Parteja tras corrièl :"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Deguns trobat"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grop"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Tornar partejar es pas permis"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Pas partejador"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "pòt modificar"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "Contraròtle d'acces"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "crea"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "met a jorn"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "escafa"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "parteja"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Parat per senhal"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Error al metre de la data d'expiracion"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>compte admin</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Senhal"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index c1b030daaa..4719f69711 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Fichièrs"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Amontcargar anullat."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo carga
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Parteja"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Torna nomenar"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Error"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Al esperar"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Error"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nom"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Talha"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Modificat"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nom"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Talha"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Modificat"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr "Talha maximum de dintrada per fichièrs ZIP"
 msgid "Save"
 msgstr "Enregistra"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Nòu"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Fichièr de tèxte"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Dorsièr"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr " Anulla l'amontcargar"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Pas res dedins. Amontcarga qualquaren"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Avalcarga"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Escafa"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Amontcargament tròp gròs"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Los fiichièrs son a èsser explorats, "
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Exploracion en cors"
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index 3814886f94..a5b84ff724 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Plaça"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Non d'usancièr"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Senhal"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Parteja"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index 436924037b..416cf4d3df 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Avalcarga"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index 61e5f8bd16..507762d8c2 100644
--- a/l10n/oc/files_trashbin.po
+++ b/l10n/oc/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Error"
-
-#: 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 "Nom"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Error"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nom"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Escafa"
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index 5e23aada74..aafd13fad5 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "Services web jos ton contraròtle"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Avalcargar los ZIP es inactiu."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Los fichièrs devan èsser avalcargats un per un."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Torna cap als fichièrs"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 017851a30a..5ca28f9233 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Corrièl enregistrat"
@@ -114,6 +124,16 @@ msgstr "Pas capable d'escafar un grop"
 msgid "Unable to delete user"
 msgstr "Pas capable d'escafar un usancièr"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Lengas cambiadas"
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "escafat"
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Jornal"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Mai d'aquò"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr "Lenga"
 msgid "Help translate"
 msgstr "Ajuda a la revirada"
 
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Login"
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index 321c69d22e..ea9ed47d04 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr[1] ""
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:984
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/or_IN/core.po b/l10n/or_IN/core.po
index fedef0897a..073ebc33d2 100644
--- a/l10n/or_IN/core.po
+++ b/l10n/or_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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/or_IN/files.po b/l10n/or_IN/files.po
index 0f62762155..868114f113 100644
--- a/l10n/or_IN/files.po
+++ b/l10n/or_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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/or_IN/files_external.po b/l10n/or_IN/files_external.po
index 91e961105d..d7c69ee3b9 100644
--- a/l10n/or_IN/files_external.po
+++ b/l10n/or_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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 22:46+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,166 @@ msgstr ""
 "Language: or_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:598
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:608
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:630
+#: lib/config.php:621
 #, 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:632
+#: lib/config.php:623
 #, 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:634
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/or_IN/files_sharing.po b/l10n/or_IN/files_sharing.po
index 6a3737458a..3d04a3f247 100644
--- a/l10n/or_IN/files_sharing.po
+++ b/l10n/or_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 22:46+0000\n"
+"POT-Creation-Date: 2014-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 05:55+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/or_IN/files_trashbin.po b/l10n/or_IN/files_trashbin.po
index efddff7ea5..4737608364 100644
--- a/l10n/or_IN/files_trashbin.po
+++ b/l10n/or_IN/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 22:46+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr ""
-
-#: js/trash.js:62 templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: js/trash.js:264
-msgid "Deleted Files"
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
 msgstr ""
 
 #: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:19
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:30
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
diff --git a/l10n/or_IN/lib.po b/l10n/or_IN/lib.po
index 3b0afaf281..2f8149312f 100644
--- a/l10n/or_IN/lib.po
+++ b/l10n/or_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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,15 @@ msgstr ""
 "Language: or_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/or_IN/settings.po b/l10n/or_IN/settings.po
index e3510389e2..62689b972c 100644
--- a/l10n/or_IN/settings.po
+++ b/l10n/or_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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/pa/core.po b/l10n/pa/core.po
index 532f378789..2b5ff1807f 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -59,207 +59,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "ਐਤਵਾਰ"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "ਸੋਮਵਾਰ"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "ਮੰਗਲਵਾਰ"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "ਬੁੱਧਵਾਰ"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "ਵੀਰਵਾਰ"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "ਸ਼ੁੱਕਰਵਾਰ"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "ਸ਼ਨਿੱਚਰਵਾਰ"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "ਜਨਵਰੀ"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "ਫਰਵਰੀ"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "ਮਾਰਚ"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "ਅਪਰੈ"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "ਮਈ"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "ਜੂਨ"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "ਜੁਲਾਈ"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "ਅਗਸਤ"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "ਸਤੰਬ"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "ਅਕਤੂਬਰ"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "ਨਵੰਬ"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "ਦਸੰਬਰ"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "ਸੈਟਿੰਗ"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "ਸਕਿੰਟ ਪਹਿਲਾਂ"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "ਅੱਜ"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "ਕੱਲ੍ਹ"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "ਪਿਛਲੇ ਮਹੀਨੇ"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "ਪਿਛਲੇ ਸਾਲ"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "ਚੁਣੋ"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "ਹਾਂ"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "ਨਹੀਂ"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "ਚੁਣੋ"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "ਠੀਕ ਹੈ"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,12 +291,12 @@ msgstr ""
 msgid "Share"
 msgstr "ਸਾਂਝਾ ਕਰੋ"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "ਗਲ"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -324,107 +324,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr "ਭੇਜੋ"
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
@@ -668,6 +677,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "ਪਾਸਵਰ"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/pa/files.po b/l10n/pa/files.po
index da22e59a2a..417167535c 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "ਫਾਇਲਾਂ"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "ਸਾਂਝਾ ਕਰੋ"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "ਨਾਂ ਬਦਲੋ"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "ਗਲਤੀ"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "ਗਲਤੀ"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "ਡਾਊਨਲੋਡ"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "ਹਟਾਓ"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/pa/files_external.po b/l10n/pa/files_external.po
index 48a189abb1..e1bedd6479 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "ਪਾਸਵਰ"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "ਸਾਂਝਾ ਕਰੋ"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/pa/files_sharing.po b/l10n/pa/files_sharing.po
index 93261c71ce..0ebf7dc049 100644
--- a/l10n/pa/files_sharing.po
+++ b/l10n/pa/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "ਡਾਊਨਲੋਡ"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/pa/files_trashbin.po b/l10n/pa/files_trashbin.po
index 4ab7cac41e..4387e84324 100644
--- a/l10n/pa/files_trashbin.po
+++ b/l10n/pa/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr ""
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "ਗਲਤੀ"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "ਹਟਾਓ"
diff --git a/l10n/pa/lib.po b/l10n/pa/lib.po
index 9008d834aa..1ca6ecedb7 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/pa/settings.po b/l10n/pa/settings.po
index 9e45a08cb1..df6f78dd42 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -99,6 +99,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -115,6 +125,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "ਭਾਸ਼ਾ ਬਦਲੀ"
@@ -170,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -226,34 +246,42 @@ msgstr ""
 msgid "Updated"
 msgstr "ਅੱਪਡੇਟ ਕੀਤਾ"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "ਹਟਾਈ"
@@ -299,7 +327,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__ਭਾਸ਼ਾ_ਨਾਂ__"
 
@@ -487,148 +515,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "ਸਰਵਰ ਐਡਰੈਸ"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +804,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "ਲਾਗਇਨ"
diff --git a/l10n/pa/user_ldap.po b/l10n/pa/user_ldap.po
index 1005e8e45c..ed8eefdd36 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr[1] ""
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:984
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 1fa61458c8..d472a2e706 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -62,212 +62,212 @@ msgstr "Brak obrazka profilu tymczasowego, spróbuj ponownie"
 msgid "No crop data provided"
 msgstr "Brak danych do przycięcia"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Środa"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Piątek"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sobota"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Styczeń"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Luty"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Marzec"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Kwiecień"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Czerwiec"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Lipiec"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Sierpień"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Wrzesień"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Październik"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Listopad"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Grudzień"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Zapisywanie..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: js/js.js:1247
+#: js/js.js:1241
 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:1248
+#: js/js.js:1242
 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:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "dziś"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: js/js.js:1251
+#: js/js.js:1245
 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:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "w zeszłym miesiącu"
 
-#: js/js.js:1253
+#: js/js.js:1247
 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:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "w zeszłym roku"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "lat temu"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Wybierz"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Błąd podczas ładowania pliku wybranego szablonu: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Tak"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nie"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Wybierz"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Błąd podczas ładowania pliku wybranego szablonu: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "OK"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Błąd podczas ładowania szablonu wiadomości: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} konfliktów plików"
 msgstr[1] "{count} konfliktów plików"
 msgstr[2] "{count} konfliktów plików"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Konflikt pliku"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Nowe pliki"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Już istniejące pliki"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Które pliki chcesz zachować?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Kontynuuj "
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(wszystkie zaznaczone)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} zaznaczonych)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Błąd podczas ładowania szablonu istniejącego pliku"
 
@@ -299,12 +299,12 @@ msgstr "Udostępniono"
 msgid "Share"
 msgstr "Udostępnij"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Błąd"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Błąd podczas współdzielenia"
 
@@ -332,107 +332,116 @@ msgstr "Współdziel z użytkownikiem lub grupą ..."
 msgid "Share link"
 msgstr "Udostępnij link"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia"
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr "Domyślnie link publiczny wygaśnie po {days} dniach"
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Zabezpiecz hasłem"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Hasło"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Pozwól na  publiczne wczytywanie"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Wyślij osobie odnośnik poprzez e-mail"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Wyślij"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Ustaw datę wygaśnięcia"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Data wygaśnięcia"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Współdziel poprzez e-mail:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Nie znaleziono ludzi"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grupa"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Współdzielenie nie jest możliwe"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Współdzielone w {item} z {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Zatrzymaj współdzielenie"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "powiadom przez emaila"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "może edytować"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "kontrola dostępu"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "utwórz"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "uaktualnij"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "usuń"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "współdziel"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Zabezpieczone hasłem"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Błąd podczas usuwania daty wygaśnięcia"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Błąd podczas ustawiania daty wygaśnięcia"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Wysyłanie..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "E-mail wysłany"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
@@ -676,6 +685,10 @@ msgstr "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoz
 msgid "Create an <strong>admin account</strong>"
 msgstr "Utwórz <strong>konta administratora</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Hasło"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Zasoby dysku & baza danych"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 689ee4af57..1dffe63225 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -33,7 +33,7 @@ msgstr "Nie można było przenieść %s - Plik o takiej nazwie już istnieje"
 msgid "Could not move %s"
 msgstr "Nie można było przenieść %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Nazwa pliku nie może być pusta."
 
@@ -42,18 +42,18 @@ msgstr "Nazwa pliku nie może być pusta."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" jest nieprawidłową nazwą pliku."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Folder docelowy został przeniesiony lub usunięty"
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -145,28 +145,32 @@ msgstr "Nieudane przesłanie. Nie można pobrać informacji o pliku."
 msgid "Invalid directory."
 msgstr "Zła ścieżka."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Pliki"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Całkowity rozmiar {size1} przekracza limit uploadu {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 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:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Wczytywanie anulowane."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Nie można uzyskać wyniku z serwera."
 
@@ -179,134 +183,138 @@ msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie z
 msgid "URL cannot be empty"
 msgstr "URL nie może być pusty"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} już istnieje"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Nie można utworzyć pliku"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Nie można utworzyć folderu"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Błąd przy pobieraniu adresu URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Udostępnij"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Trwale usuń"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Błąd prz przenoszeniu pliku"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Błąd"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Oczekujące"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Błąd podczas przenoszenia pliku."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Błąd prz przenoszeniu pliku"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Błąd"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Nie można zmienić nazwy pliku"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Błąd podczas usuwania pliku"
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nazwa"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Rozmiar"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Modyfikacja"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n katalog"
 msgstr[1] "%n katalogi"
 msgstr[2] "%n katalogów"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n plik"
 msgstr[1] "%n pliki"
 msgstr[2] "%n plików"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} i {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Wysyłanie %n pliku"
 msgstr[1] "Wysyłanie %n plików"
 msgstr[2] "Wysyłanie %n plików"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" jest nieprawidłową nazwą pliku."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Twój magazyn jest prawie pełny ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie."
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz. Można zaktualizować hasło klucza prywatnego w ustawieniach osobistych w celu odzyskania dostępu do plików"
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} i {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nazwa"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Rozmiar"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Modyfikacja"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s nie można zmienić nazwy"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Wysyłka (max. %s)"
@@ -343,68 +351,75 @@ msgstr "Maksymalna wielkość pliku wejściowego ZIP "
 msgid "Save"
 msgstr "Zapisz"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Nowy"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Nowy plik tekstowy"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Plik tekstowy"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nowy folder"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Z odnośnika"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Pliki usunięte"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Anuluj wysyłanie"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Pusto. Wyślij coś!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Pobierz"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Usuń"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Ładowany plik jest za duży"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Skanowanie plików, proszę czekać."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Aktualnie skanowane"
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index ea9e545147..e29cefde2a 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/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-04-10 01:54-0400\n"
-"PO-Revision-Date: 2014-04-09 10:53+0000\n"
-"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -19,6 +19,166 @@ 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"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Lokalny"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Lokalizacja"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Klucz"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Hasło"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr "Kosz"
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr "Amazon S3 i zgodne"
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "Klucz dostępu"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Klucz hasła"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "Nazwa hosta (opcjonalnie)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Port (opcjonalnie)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Region (opcjonalnie)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Włącz SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr "Włącz styl ścieżki"
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "Klucz aplikacji"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr "Hasło aplikacji"
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Nazwa użytkownika"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Hasło"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Root"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "Bezpieczny ftps://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "ID klienta"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr "Hasło klienta"
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr "Magazyn obiektów OpenStack"
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Użytkownik (wymagany)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr "Kosz (wymagany)"
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr "Region (opcjonalny dla magazynu obiektów OpenStack)"
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr "Klucz API (wymagany dla plików Rackspace Cloud)"
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr "Nazwa najemcy (wymagana dla magazynu obiektów OpenStack)"
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr "Hasło (wymagane dla magazynu obiektów OpenStack)"
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr "Nazwa usługi (wymagana dla magazynu obiektów OpenStack)"
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr "URL lub zakończenie jednostki (wymagane dla magazynu obiektów OpenStack)"
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr "Czas wygaśnięcia żądań HTTP w sekundach (opcjonalne)"
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Udostępnij"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr "SMB / CIFS przy użyciu loginu OC"
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr "Użytkownik jako zasób"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "Bezpieczny https://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "Zdalny podfolder"
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Dostęp do"
@@ -43,29 +203,29 @@ msgstr "Wystąpił błąd podczas konfigurowania zasobu Google Drive"
 msgid "Saved"
 msgstr "Zapisano"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Uwaga:</b> "
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr "oraz"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 "<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:626
+#: lib/config.php:623
 #, 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 "<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:628
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index a1b63c57f0..9d3c98ca99 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-16 03:12-0400\n"
-"PO-Revision-Date: 2014-03-15 15:10+0000\n"
-"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -19,7 +19,7 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Udostępnione przez {owner}"
 
@@ -59,16 +59,15 @@ msgstr "Udostępnianie jest wyłączone"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Aby uzyskać więcej informacji proszę poprosić osobę, która wysłał ten link."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "udostępniony przez %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Pobierz"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Pobierz %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Bezpośredni link"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index 894e1002d1..2be8c3f58b 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Nie można trwale usunąć %s"
 msgid "Couldn't restore %s"
 msgstr "Nie można przywrócić %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Pliki usunięte"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Błąd"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Usunięte pliki"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "przywrócony"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Nic tu nie ma. Twój kosz jest pusty!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nazwa"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Przywróć"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Błąd"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "przywrócony"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Nic tu nie ma. Twój kosz jest pusty!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nazwa"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Usunięte"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Usuń"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 62de5ed13a..732eb446ad 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -19,13 +19,16 @@ 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"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
-msgstr ""
+msgstr "Dostajesz się do serwera z niezaufanej domeny."
 
-#: base.php:724
-msgid "Please contact your administrator"
-msgstr ""
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr "Proszę skontaktuj się z administratorem. Jeśli jesteś administratorem tej instancji, skonfiguruj parametr \"trusted_domain\" w pliku config/config.php. Przykładowa konfiguracja jest dostępna w pliku config/config.sample.php."
 
 #: private/app.php:236
 #, php-format
@@ -75,23 +78,23 @@ msgstr "Błędne zdjęcie"
 msgid "web services under your control"
 msgstr "Kontrolowane serwisy"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Pobieranie ZIP jest wyłączone."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Pliki muszą zostać pobrane pojedynczo."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Wróć do plików"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Wybrane pliki są zbyt duże, aby wygenerować plik zip."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -277,19 +280,19 @@ msgstr "Ustaw nazwę administratora."
 msgid "Set an admin password."
 msgstr "Ustaw hasło administratora."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s Współdzielone »%s« z tobą"
@@ -297,7 +300,7 @@ msgstr "%s Współdzielone »%s« z tobą"
 #: private/share/share.php:498
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
+msgstr "Wspóldzielenie %s nie powiodło się. ponieważ plik nie istnieje"
 
 #: private/share/share.php:523
 #, php-format
@@ -331,73 +334,79 @@ msgstr "Współdzielenie %s nie powiodło się, ponieważ grupa %s nie istnieje"
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ %s nie jest członkiem grupy %s"
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ współdzielenie z linkami nie jest dozwolone"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Typ udziału %s nie jest właściwy dla %s"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Ustawienie uprawnień dla %s nie powiodło się, ponieważ uprawnienia wykraczają poza przydzielone %s"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Ustawienie uprawnień dla %s nie powiodło się, ponieważ element nie został znaleziony"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Zaplecze do współdzielenia %s musi implementować interfejs OCP\\Share_Backend"
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Zaplecze %s do współdzielenia nie zostało znalezione"
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Zaplecze do współdzielenia %s nie zostało znalezione"
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s jest udostępniającym"
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ uprawnienia przekraczają te udzielone %s"
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ ponowne współdzielenie nie jest dozwolone"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ zaplecze współdzielenia dla %s nie mogło znaleźć jego źródła"
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ plik nie może zostać odnaleziony w buforze plików"
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Nie można odnaleźć kategorii \"%s\""
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index ffcba5ce72..429ddfd470 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Tryb wysyłki"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Szyfrowanie"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Metoda autentykacji"
 
@@ -101,6 +101,16 @@ msgstr "Nie można zdeszyfrować Twoich plików, proszę sprawdzić owncloud.log
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie"
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Klucze szyfrujące zostały trwale usunięte"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź owncloud.log lub zapytaj administratora"
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "E-mail zapisany"
@@ -117,6 +127,16 @@ msgstr "Nie można usunąć grupy"
 msgid "Unable to delete user"
 msgstr "Nie można usunąć użytkownika"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Archiwum zostało prawidłowo przywrócone"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Nie można przywrócić kluczy szyfrujących, proszę sprawdzić owncloud.log lub zapytać administratora"
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Zmieniono język"
@@ -172,7 +192,7 @@ msgstr "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownik
 msgid "Unable to change password"
 msgstr "Nie można zmienić hasła"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Wysyłam..."
 
@@ -228,34 +248,42 @@ msgstr "Aktualizuj"
 msgid "Updated"
 msgstr "Zaktualizowano"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Wybierz zdjęcie profilu"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Bardzo słabe hasło"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Słabe hasło"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Mało skomplikowane hasło"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Dobre hasło"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Mocne hasło"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Usuń trwale klucze szyfrujące."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Przywróć klucze szyfrujące."
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "usunięto"
@@ -301,7 +329,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "polski"
 
@@ -489,148 +517,143 @@ msgstr "Zezwalaj aplikacjom na korzystanie z API udostępniania"
 msgid "Allow links"
 msgstr "Zezwalaj na odnośniki"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Pozwól na  publiczne wczytywanie"
 
-#: 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:230
+msgid "Set default expiration date"
+msgstr "Ustaw domyślną datę wygaśnięcia"
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr "Wygaś po"
 
 #: templates/admin.php:235
+msgid "days"
+msgstr "dniach"
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr "Wymuś datę wygaśnięcia"
+
+#: templates/admin.php:242
+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:252
 msgid "Allow resharing"
 msgstr "Zezwalaj na ponowne udostępnianie"
 
-#: templates/admin.php:236
+#: templates/admin.php:253
 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:243
+#: templates/admin.php:260
 msgid "Allow users to share with anyone"
 msgstr "Zezwalaj użytkownikom na współdzielenie z kimkolwiek"
 
-#: templates/admin.php:246
+#: templates/admin.php:263
 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:253
+#: templates/admin.php:270
 msgid "Allow mail notification"
 msgstr "Pozwól na mailowe powiadomienia"
 
-#: templates/admin.php:254
+#: templates/admin.php:271
 msgid "Allow users to send mail notification for shared files"
 msgstr "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików"
 
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
-
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Bezpieczeństwo"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Wymuś HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "Serwer pocztowy"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "To jest używane do wysyłania powiadomień"
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Z adresu"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Wymagana autoryzacja"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Adres Serwera"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Poświadczenia"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "Użytkownik SMTP"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "Hasło SMTP"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Ustawienia testowej wiadomości"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Wyślij email"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Poziom logów"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Więcej"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Mniej"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Wersja"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -783,29 +806,33 @@ msgstr "Język"
 msgid "Help translate"
 msgstr "Pomóż w tłumaczeniu"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Hasło logowania"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Odszyfruj wszystkie pliki"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Twoje klucze szyfrujące zostały przeniesione do lokalizacji archialnej. Jeśli coś poszło nie tak, możesz je przywrócić. Usuń je trwale tylko, gdy jesteś pewien(na), że wszystkie pliki zostały prawidłowo zdeszyfrowane."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Przywróć klucze szyfrujące"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Usuń klucze szyfrujące"
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Login"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index e25e05427f..3dcc7b99d0 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -91,47 +91,47 @@ msgstr "Sukces"
 msgid "Error"
 msgstr "Błąd"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfiguracja poprawna"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Konfiguracja niepoprawna"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Konfiguracja niekompletna"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Wybierz grupy"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Wybierz obiekty klas"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Wybierz atrybuty"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Test połączenia udany"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Test połączenia nie udany"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Czy chcesz usunąć bieżącą konfigurację serwera?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Potwierdź usunięcie"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -139,7 +139,7 @@ msgstr[0] "%s znaleziona grupa"
 msgstr[1] "%s znalezionych grup"
 msgstr[2] "%s znalezionych grup"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -147,11 +147,11 @@ msgstr[0] "%s znaleziony użytkownik"
 msgstr[1] "%s znalezionych użytkowników"
 msgstr[2] "%s znalezionych użytkowników"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Niepoprawny Host"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Nie można znaleźć żądanej funkcji"
 
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 13e8c470cc..fe73048ef7 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"PO-Revision-Date: 2014-05-18 13:53+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,207 +60,207 @@ msgstr "Sem imagem no perfil temporário disponível, tente novamente"
 msgid "No crop data provided"
 msgstr "Nenhum dado para coleta foi fornecido"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sábado"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "janeiro"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "fevereiro"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "março"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "abril"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "maio"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "junho"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "julho"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "agosto"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "setembro"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "outubro"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "novembro"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "dezembro"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Salvando..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] " ha %n minuto"
 msgstr[1] "ha %n minutos"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "ha %n hora"
 msgstr[1] "ha %n horas"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "ha %n dia"
 msgstr[1] "ha %n dias"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "último mês"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "ha %n mês"
 msgstr[1] "ha %n meses"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "último ano"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "anos atrás"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Escolha"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Erro no seletor de carregamento modelo de arquivos: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Sim"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Não"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Escolha"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Erro no seletor de carregamento modelo de arquivos: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Erro no carregamento de modelo de mensagem: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} conflito de arquivo"
 msgstr[1] "{count} conflitos de arquivos"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Conflito em um arquivo"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Novos Arquivos"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Arquivos já existentes"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Qual arquivo você quer manter?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Continuar"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(todos os selecionados)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} selecionados)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Erro ao carregar arquivo existe modelo"
 
@@ -292,12 +292,12 @@ msgstr "Compartilhados"
 msgid "Share"
 msgstr "Compartilhar"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Erro"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Erro ao compartilhar"
 
@@ -325,107 +325,116 @@ msgstr "Compartilhar com usuário ou grupo ..."
 msgid "Share link"
 msgstr "Compartilher link"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "O link público irá expirar não antes de {days} depois de ser criado"
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr "Por padrão o link público irá expirar após {days} dias"
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Proteger com senha"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Senha"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr "Escolha uma senha para o link público"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Permitir upload público"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Enviar link por e-mail"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Definir data de expiração"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Data de expiração"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Compartilhar via e-mail:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Nenhuma pessoa encontrada"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Não é permitido re-compartilhar"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Compartilhado em {item} com {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Descompartilhar"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "notificar por e-mail"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "controle de acesso"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "criar"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "atualizar"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "remover"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "compartilhar"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Protegido com senha"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Erro ao remover data de expiração"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Erro ao definir data de expiração"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Enviando ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "E-mail enviado"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Aviso"
 
@@ -669,6 +678,10 @@ msgstr "Para obter informações sobre como configurar corretamente o seu servid
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta de administrador</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Senha"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Armazenamento & banco de dados"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 7b4f254221..5617adc97f 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"PO-Revision-Date: 2014-05-18 13:53+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +30,7 @@ msgstr "Impossível mover %s - Um arquivo com este nome já existe"
 msgid "Could not move %s"
 msgstr "Impossível mover %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "O nome do arquivo não pode estar vazio."
 
@@ -39,18 +39,18 @@ msgstr "O nome do arquivo não pode estar vazio."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" é um nome de arquivo inválido."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "A pasta de destino foi movida ou excluída."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -142,28 +142,32 @@ msgstr "Falha no envio. Não foi possível obter informações do arquivo."
 msgid "Invalid directory."
 msgstr "Diretório inválido."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Arquivos"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Todos os arquivos"
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Tamanho total do arquivo {size1} excede limite de envio {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 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:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Não foi possível obter o resultado do servidor."
 
@@ -176,131 +180,135 @@ msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do
 msgid "URL cannot be empty"
 msgstr "URL não pode estar vazia"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} já existe"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Não foi possível criar o arquivo"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Não foi possível criar a pasta"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Erro ao buscar URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Compartilhar"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Excluir permanentemente"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Erro movendo o arquivo"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Erro"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Erro movendo o arquivo."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Erro movendo o arquivo"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Erro"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Não foi possível renomear o arquivo"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Erro eliminando o arquivo."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nome"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Tamanho"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Modificado"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n pasta"
 msgstr[1] "%n pastas"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n arquivo"
 msgstr[1] "%n arquivos"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} e {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Enviando %n arquivo"
 msgstr[1] "Enviando %n arquivos"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" é um nome de arquivo inválido."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Seu armazenamento está quase cheio ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "App de encriptação está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente"
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Chave do App de Encriptação é inválida. Por favor, atualize sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Encriptação foi desabilitada mas seus arquivos continuam encriptados. Por favor vá a suas configurações pessoais para descriptar seus arquivos."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} e {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nome"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Tamanho"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Modificado"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s não pode ser renomeado"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Envio (max. %s)"
@@ -337,68 +345,75 @@ msgstr "Tamanho máximo para arquivo ZIP"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Novo"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Novo arquivo texto"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Arquivo texto"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Pasta"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Do link"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Arquivos apagados"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Cancelar upload"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Nada aqui.Carrege alguma coisa!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Excluir"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Upload muito grande"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Arquivos sendo escaneados, por favor aguarde."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Scanning atual"
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index 0a8a376d6f..547eab2e2d 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/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-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"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,166 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Local"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Local"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Chave"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Secreta"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr "Cesta"
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr "Amazon S3 e compatível"
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "Chave de Acesso"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Chave Secreta"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "Nome do Host (opcional)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Porta (opcional)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Região (opcional)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Habilitar SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr "Habilitar Estilo do Caminho"
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "Chave do Aplicativo"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr "Segredo da Aplicação"
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Servidor"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Nome de Usuário"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Senha"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Raiz"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "Seguro ftps://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "ID do Cliente"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr "Segredo do cliente"
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr "Armazenamento de Objetos OpenStack"
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Nome do Usuário (requerido)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr "Cesta (requerido)"
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr "Região (opcional para armazenamento de objetos OpenStack)"
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr "Chave API (necessário para Rackspace Cloud File)"
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr "Nome Tenant (necessário para armazenamento de objetos OpenStack)"
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr "Senha (necessário para armazenamento de objetos OpenStack)"
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr "Nome do Serviço (necessário para armazenamento de objetos OpenStack)"
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr "Ponto final de identidade da URL (obrigatório para armazenamento de objetos OpenStack)"
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr "Tempo limite de solicitações HTTP em segundos (opcional)"
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Compartilhar"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr "SMB / CIFS usando OC logon"
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr "Nome de usuário como compartilhado"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "https:// segura"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "Subpasta remota"
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Acesso concedido"
@@ -42,29 +202,29 @@ msgstr "Erro ao configurar armazenamento do Google Drive"
 msgid "Saved"
 msgstr "Salvo"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Nota:</b>"
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr "e"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 "<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:626
+#: lib/config.php:623
 #, 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 "<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:628
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 959ab06aad..7d203b0ce1 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Compartilhado por {owner}"
 
@@ -58,16 +58,15 @@ msgstr "compartilhamento está desativada"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para mais informações, por favor, pergunte a pessoa que enviou este link."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "compartilhado por %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Baixar"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Baixar %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Link direto"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index b4a8bb1acc..c1aec688dc 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Não foi possível excluir %s permanentemente"
 msgid "Couldn't restore %s"
 msgstr "Não foi possível restaurar %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Arquivos apagados"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Erro"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Arquivos Apagados"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "restaurado"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Nada aqui. Sua lixeira está vazia!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nome"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Restaurar"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Erro"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "restaurado"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Nada aqui. Sua lixeira está vazia!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nome"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Excluído"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Excluir"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index 345c0ee42d..df1632bf62 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 18:00+0000\n"
-"Last-Translator: giovanisp\n"
+"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"PO-Revision-Date: 2014-05-18 13:53+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,16 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Você está acessando o servidor a partir de um domínio não confiável."
 
-#: base.php:724
-msgid "Please contact your administrator"
-msgstr "Por favor, contate o administrador."
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr "Por favor, contate o administrador. Se você é um administrador desta instância, configurre o \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php."
 
 #: private/app.php:236
 #, php-format
@@ -75,23 +78,23 @@ msgstr "Imagem inválida"
 msgid "web services under your control"
 msgstr "serviços web sob seu controle"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Download ZIP está desligado."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Arquivos precisam ser baixados um de cada vez."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Voltar para Arquivos"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Arquivos selecionados são muito grandes para gerar arquivo zip."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -277,19 +280,19 @@ msgstr "Defina um nome de usuário de administrador."
 msgid "Set an admin password."
 msgstr "Defina uma senha de administrador."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s compartilhou »%s« com você"
@@ -331,73 +334,79 @@ msgstr "Compartilhamento %s falhou, porque o grupo %s não existe"
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Compartilhamento %s falhou, porque  %s não é membro do grupo %s"
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Você precisa fornecer uma senha para criar um link público, apenas links protegidos são permitidos"
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Compartilhamento %s falhou, porque compartilhamento com links não é permitido"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Tipo de compartilhamento %s não é válido para %s"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Definir permissões para %s falhou, porque o item não foi encontrado"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Compartilhando backend %s deve implementar a interface OCP\\Share_Backend"
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Compartilhamento backend %s não encontrado"
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Compartilhamento backend para %s não encontrado"
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Compartilhando %s falhou, porque o usuário %s é o compartilhador original"
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Compartilhamento %s falhou, porque as permissões excedem as permissões concedidas a %s"
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Compartilhamento %s falhou, porque recompartilhamentos não são permitidos"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Compartilhamento %s falhou, porque a infra-estrutura de compartilhamento para %s não conseguiu encontrar a sua fonte"
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr "Compartilhamento %s falhou, porque o arquivo não pôde ser encontrado no cache de arquivos"
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Impossível localizar categoria \"%s\""
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 9321507f33..2c171c3eaa 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"PO-Revision-Date: 2014-05-18 13:53+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,15 +50,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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Modo enviar"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Criptografia"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Método de autenticação"
 
@@ -101,6 +101,16 @@ msgstr "Não foi possível descriptografar os arquivos, verifique a sua owncloud
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Não foi possível descriptografar os arquivos, verifique sua senha e tente novamente"
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Chaves de criptografia excluídas permanentemente"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Não foi possível excluir permanentemente suas chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador"
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "E-mail salvo"
@@ -117,6 +127,16 @@ msgstr "Não foi possível remover grupo"
 msgid "Unable to delete user"
 msgstr "Não foi possível remover usuário"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Backup restaurado com sucesso"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Não foi possível salvar as chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador"
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Idioma alterado"
@@ -172,7 +192,7 @@ msgstr "Back-end não suporta alteração de senha, mas a chave de criptografia
 msgid "Unable to change password"
 msgstr "Impossível modificar senha"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Enviando..."
 
@@ -228,34 +248,42 @@ msgstr "Atualizar"
 msgid "Updated"
 msgstr "Atualizado"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Selecione uma imagem para o perfil"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Senha muito fraca"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Senha fraca"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "So-so senha"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Boa senha"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Senha forte"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Eliminando a chave de criptografia permanentemente."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Restaurar chave de criptografia."
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "excluído"
@@ -301,7 +329,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Português (Brasil)"
 
@@ -489,148 +517,143 @@ msgstr "Permitir que aplicativos usem a API de Compartilhamento"
 msgid "Allow links"
 msgstr "Permitir links"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr "Reforce a proteção por senha"
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Permitir envio público"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Permitir recompartilhamento"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Permitir que usuários compartilhem com qualquer um"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Permitir notificação por email"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Permitir aos usuários enviar notificação de email para arquivos compartilhados"
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
-msgstr ""
+msgstr "Configurar a data de expiração"
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr "Expirar depois de"
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr "dias"
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
-msgstr ""
+msgstr "Fazer cumprir a data de expiração"
+
+#: templates/admin.php:242
+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:252
+msgid "Allow resharing"
+msgstr "Permitir recompartilhamento"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Permitir que usuários compartilhem novamente itens compartilhados com eles"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Permitir que usuários compartilhem com qualquer um"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
-msgstr "Expirar compartilhamentos automaticamente depois de N dias"
+msgid "Allow mail notification"
+msgstr "Permitir notificação por email"
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr "Permitir aos usuários enviar notificação de email para arquivos compartilhados"
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Segurança"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Forçar HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "Servidor de Email"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Isto é usado para o envio de notificações."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Do Endereço"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Autenticação é requerida"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Endereço do servidor"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Porta"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Credenciais"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "Nome do Usuário SMTP"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "Senha SMTP"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Configurações de e-mail de teste"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Enviar email"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Nível de registro"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -783,29 +806,33 @@ msgstr "Idioma"
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Senha de login"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Decripti todos os Arquivos"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Suas chaves de criptografia forão movidas para o local de backup. Se alguma coisa deu errado, você pode salvar as chaves. Só excluí-las permanentemente se você tiver certeza de que  todos os arquivos forão descriptografados corretamente."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Restaurar Chaves de Criptografia"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Eliminar Chaves de Criptografia"
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Nome de Login"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 13dfb254b4..40a11fa12a 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -88,65 +88,65 @@ msgstr "Sucesso"
 msgid "Error"
 msgstr "Erro"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuração OK"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Configuração incorreta"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Configuração incompleta"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Selecionar grupos"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Selecione classes de objetos"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Selecione os atributos"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Teste de conexão bem sucedida"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Teste de conexão falhou"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Você quer realmente deletar as atuais Configurações de Servidor?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Confirmar Exclusão"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "grupo% s encontrado"
 msgstr[1] "grupos% s encontrado"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "usuário %s encontrado"
 msgstr[1] "usuários %s encontrados"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Host inválido"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Não foi possível encontrar a função desejada"
 
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 4db354e6cd..2a401dd2b4 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -10,12 +10,13 @@
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
 # Gontxi <goncalo.baiao@gmail.com>, 2013
 # Helder Meneses <helder.meneses@gmail.com>, 2013-2014
+# sccosta <sonia.peres.costa@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -26,7 +27,7 @@ msgstr ""
 
 #: ajax/share.php:87
 msgid "Expiration date is in the past."
-msgstr ""
+msgstr "A data de expiração é no passado."
 
 #: ajax/share.php:119 ajax/share.php:161
 #, php-format
@@ -65,229 +66,229 @@ msgstr "Foto temporária de perfil indisponível, tente novamente"
 msgid "No crop data provided"
 msgstr "Sem dados de corte fornecidos"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Segunda"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Terça"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Quarta"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Quinta"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Sexta"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sábado"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Janeiro"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Fevereiro"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Março"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Abril"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Maio"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Junho"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Julho"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Agosto"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Setembro"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Outubro"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Novembro"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Dezembro"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Configurações"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "A guardar..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "Minutos atrás"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minuto atrás"
 msgstr[1] "%n minutos atrás"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n hora atrás"
 msgstr[1] "%n horas atrás"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dia atrás"
 msgstr[1] "%n dias atrás"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "ultímo mês"
 
-#: js/js.js:1253
+#: js/js.js:1247
 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:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "ano passado"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "anos atrás"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Escolha"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Erro ao carregar o modelo de selecionador de ficheiro: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Sim"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Não"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Escolha"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Erro ao carregar o modelo de selecionador de ficheiro: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Erro ao carregar o template: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} conflicto de ficheiro"
 msgstr[1] "{count} conflitos de ficheiro"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Um conflito no ficheiro"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Ficheiros Novos"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
-msgstr ""
+msgstr "Ficheiro já existente"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Quais os ficheiros que pretende manter?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Continuar"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(todos seleccionados)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} seleccionados)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Erro ao carregar o modelo de existências do ficheiro"
 
 #: js/setup.js:84
 msgid "Very weak password"
-msgstr ""
+msgstr "Password muito fraca"
 
 #: js/setup.js:85
 msgid "Weak password"
-msgstr ""
+msgstr "Password fraca"
 
 #: js/setup.js:86
 msgid "So-so password"
-msgstr ""
+msgstr "Password aceitável"
 
 #: js/setup.js:87
 msgid "Good password"
-msgstr ""
+msgstr "Password Forte"
 
 #: js/setup.js:88
 msgid "Strong password"
-msgstr ""
+msgstr "Password muito forte"
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
@@ -297,12 +298,12 @@ msgstr "Partilhado"
 msgid "Share"
 msgstr "Partilhar"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Erro"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Erro ao partilhar"
 
@@ -330,107 +331,116 @@ msgstr "Partilhar com utilizador ou grupo..."
 msgid "Share link"
 msgstr "Partilhar o link"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Proteger com palavra-passe"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Password"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Permitir Envios Públicos"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Enviar o link por e-mail"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Especificar data de expiração"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Data de expiração"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Partilhar via email:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Não foi encontrado ninguém"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Não é permitido partilhar de novo"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Partilhado em {item} com {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Deixar de partilhar"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "Notificar por email"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "Controlo de acesso"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "criar"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "apagar"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "partilhar"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Protegido com palavra-passe"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Erro ao retirar a data de expiração"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Erro ao aplicar a data de expiração"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "A Enviar..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "E-mail enviado"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Aviso"
 
@@ -486,7 +496,7 @@ msgstr "%s reposição da password"
 msgid ""
 "A problem has occurred whilst sending the email, please contact your "
 "administrator."
-msgstr ""
+msgstr "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador."
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -549,12 +559,12 @@ msgstr "Repor password"
 msgid ""
 "Mac OS X is not supported and %s will not work properly on this platform. "
 "Use it at your own risk! "
-msgstr ""
+msgstr "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco."
 
 #: setup/controller.php:144
 msgid ""
 "For the best results, please consider using a GNU/Linux server instead."
-msgstr ""
+msgstr "Para um melhor resultado, utilize antes o servidor GNU/Linux."
 
 #: strings.php:5
 msgid "Personal"
@@ -674,9 +684,13 @@ msgstr "Para obter informações de como configurar correctamente o servidor, ve
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta administrativa</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Password"
+
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "Armazenamento e base de dados"
 
 #: templates/installation.php:77
 msgid "Data folder"
@@ -777,7 +791,7 @@ msgstr "Contas de acesso alternativas"
 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 "Olá,<br><br>apenas para informar que %s partilhou <strong>%s</strong> consigo.<br><a href=\"%s\">Consulte aqui!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 8fd301269a..7752b75560 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -6,13 +6,14 @@
 # bmgmatias <bmgmatias@gmail.com>, 2013
 # Carlos <crolidge@gmail.com>, 2014
 # FernandoMASilva, 2013
-# Helder Meneses <helder.meneses@gmail.com>, 2013
+# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
+# Drew Melim <nokostya.translation@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -31,27 +32,27 @@ msgstr "Não pôde mover o ficheiro %s - Já existe um ficheiro com esse nome"
 msgid "Could not move %s"
 msgstr "Não foi possível move o ficheiro %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "O nome do ficheiro não pode estar vazio."
 
 #: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "\"%s\" é um nome de ficheiro inválido."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "A pasta de destino foi movida ou eliminada."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -143,28 +144,32 @@ msgstr "O carregamento falhou. Não foi possível obter a informação do fichei
 msgid "Invalid directory."
 msgstr "Directório Inválido"
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Ficheiros"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponível"
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Não foi possível obter o resultado do servidor."
 
@@ -177,134 +182,138 @@ msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página
 msgid "URL cannot be empty"
 msgstr "URL não pode estar vazio"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "O nome {new_name} já existe"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Não pôde criar ficheiro"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Não pôde criar pasta"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Erro ao obter URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Partilhar"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Erro ao mover o ficheiro"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Erro"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Erro a mover o ficheiro."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Erro ao mover o ficheiro"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Erro"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Não pôde renomear o ficheiro"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Erro ao apagar o ficheiro."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nome"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Tamanho"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Modificado"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n pasta"
 msgstr[1] "%n pastas"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n ficheiro"
 msgstr[1] "%n ficheiros"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} e {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "A carregar %n ficheiro"
 msgstr[1] "A carregar %n ficheiros"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "\"{name}\" é um nome de ficheiro inválido."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "O seu armazenamento está cheio, os ficheiros não podem ser sincronizados."
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente"
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "A encriptação foi desactivada mas os seus ficheiros continuam encriptados.  Por favor consulte as suas definições pessoais para desencriptar os ficheiros."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} e {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nome"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Tamanho"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Modificado"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s não pode ser renomeada"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
-msgstr ""
+msgstr "Enviar (max. %s)"
 
 #: templates/admin.php:4
 msgid "File handling"
@@ -338,68 +347,75 @@ msgstr "Tamanho máximo para ficheiros ZIP"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Novo"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Novo ficheiro de texto"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Ficheiro de texto"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nova Pasta"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Pasta"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Da ligação"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Ficheiros eliminados"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Cancelar envio"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Vazio. Envie alguma coisa!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Upload muito grande"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Análise actual"
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index 8aab0d9e28..7ab6f28d93 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -7,13 +7,14 @@
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
 # moura232 <moura232@gmail.com>, 2013
 # Helder Meneses <helder.meneses@gmail.com>, 2013-2014
+# Drew Melim <nokostya.translation@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 14:50+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 18:55+0000\n"
+"Last-Translator: Drew Melim <nokostya.translation@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,7 +94,7 @@ msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
-msgstr ""
+msgstr "Por favor, certifique-se que PHP 5.3.3 ou mais recente está instalado e que  OpenSSL juntamente com a extensão  PHP está ativada e corretamente configurada. Por agora, a aplicação de  encriptação está desactivada."
 
 #: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
@@ -101,7 +102,7 @@ msgstr "Os utilizadores seguintes não estão marcados para cifragem:"
 
 #: js/detect-migration.js:21
 msgid "Initial encryption started... This can take some time. Please wait."
-msgstr ""
+msgstr "A encriptação inicial começou... Pode demorar algum tempo. Aguarde, por favor."
 
 #: js/detect-migration.js:25
 msgid "Initial encryption running... Please try again later."
@@ -130,7 +131,7 @@ msgstr "Chave de recuperação da conta"
 
 #: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Repetir a chave de recuperação da conta"
 
 #: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
@@ -154,7 +155,7 @@ msgstr "Nova chave de recuperação da conta"
 
 #: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Repetir a nova chave de recuperação da conta"
 
 #: templates/settings-admin.php:56
 msgid "Change Password"
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index d46f758eef..176d767f2d 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -6,12 +6,13 @@
 # Mouxy <daniel@mouxy.net>, 2013
 # Helder Meneses <helder.meneses@gmail.com>, 2014
 # jmruas <jmruas@gmail.com>, 2014
+# Drew Melim <nokostya.translation@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-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -20,6 +21,166 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Local"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Local"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Chave"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Secreto"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "Chave de acesso"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Chave Secreta"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Porta (opcional)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Região (opcional)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Activar SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "Chave da aplicação"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr "Chave secreta da aplicação"
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Endereço"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Nome de utilizador"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Palavra-passe"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Raiz"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "ID Cliente"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr "Segredo do cliente"
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Utilizador (requerido)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Partilhar"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "Sub-pasta remota "
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Acesso autorizado"
@@ -44,34 +205,34 @@ msgstr "Erro ao configurar o armazenamento do Google Drive"
 msgid "Saved"
 msgstr "Guardado"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>Aviso:</b> "
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
-msgstr ""
+msgstr "e"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 ""
+msgstr "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar."
 
-#: lib/config.php:626
+#: lib/config.php:623
 #, 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 ""
+msgstr "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar."
 
-#: lib/config.php:628
+#: lib/config.php:625
 #, 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 ""
+msgstr "<b>Aviso:</b> O cliente\"%s\" não está instalado. Não é possível montar \"%s\" . Peça ao seu administrador para instalar."
 
 #: templates/settings.php:2
 msgid "External Storage"
@@ -95,7 +256,7 @@ msgstr "Opções"
 
 #: templates/settings.php:12
 msgid "Available for"
-msgstr ""
+msgstr "Disponível para "
 
 #: templates/settings.php:32
 msgid "Add storage"
@@ -103,7 +264,7 @@ msgstr "Adicionar armazenamento"
 
 #: templates/settings.php:92
 msgid "No user or group"
-msgstr ""
+msgstr "Sem utilizador nem grupo"
 
 #: templates/settings.php:95
 msgid "All Users"
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index bd36354d94..56ea5584c6 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/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 16:10+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -21,7 +21,7 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Partilhado por {owner}"
 
@@ -61,16 +61,15 @@ msgstr "A partilha está desativada"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para mais informações, por favor questione a pessoa que lhe enviou este link"
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "partilhada por %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Transferir"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Download %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Link direto"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index 1d201c8a06..143d4a9d38 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Não foi possível eliminar %s de forma permanente"
 msgid "Couldn't restore %s"
 msgstr "Não foi possível restaurar %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Ficheiros eliminados"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Erro"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Ficheiros Apagados"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "Restaurado"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Não hà ficheiros. O lixo está vazio!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Nome"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Restaurar"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Erro"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "Restaurado"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Não hà ficheiros. O lixo está vazio!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nome"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Apagado"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Eliminar"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index 91ba10b835..e2cf4cdd7a 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Helder Meneses <helder.meneses@gmail.com>, 2013
+# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
 # jmruas <jmruas@gmail.com>, 2014
+# Drew Melim <nokostya.translation@gmail.com>, 2014
 # PapiMigas Migas <papimigas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -20,12 +21,15 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -76,23 +80,23 @@ msgstr "Imagem inválida"
 msgid "web services under your control"
 msgstr "serviços web sob o seu controlo"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Descarregamento em ZIP está desligado."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros precisam de ser descarregados um por um."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Voltar a Ficheiros"
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -210,7 +214,7 @@ msgstr "Precisa de introduzir uma conta existente ou de administrador"
 
 #: private/setup/mysql.php:12
 msgid "MySQL/MariaDB username and/or password not valid"
-msgstr ""
+msgstr "Nome de utilizador/password do MySQL/Maria DB inválida"
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -238,20 +242,20 @@ msgstr "O comando gerador de erro foi: \"%s\""
 #: private/setup/mysql.php:85
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "O utilizador '%s'@'localhost' do MySQL/MariaDB já existe."
 
 #: private/setup/mysql.php:86
 msgid "Drop this user from MySQL/MariaDB"
-msgstr ""
+msgstr "Eliminar este utilizador do MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "O utilizador '%s'@'%%' do MySQL/MariaDB já existe"
 
 #: private/setup/mysql.php:92
 msgid "Drop this user from MySQL/MariaDB."
-msgstr ""
+msgstr "Eliminar este utilizador do MySQL/MariaDB"
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -278,22 +282,22 @@ msgstr "Definir um nome de utilizador de administrador"
 msgid "Set an admin password."
 msgstr "Definiar uma password de administrador"
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr "%s partilhado »%s« contigo"
+msgstr "%s partilhado »%s« consigo"
 
 #: private/share/share.php:498
 #, php-format
@@ -303,12 +307,12 @@ msgstr ""
 #: private/share/share.php:523
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
-msgstr ""
+msgstr "A partilha %s falhou, porque o utilizador %s é o proprietário"
 
 #: private/share/share.php:529
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
-msgstr ""
+msgstr "A partilha %s falhou, porque o utilizador %s nao existe"
 
 #: private/share/share.php:538
 #, php-format
@@ -332,73 +336,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Não foi encontrado a categoria \"%s\""
@@ -455,7 +465,7 @@ msgstr "anos atrás"
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "Apenas os seguintes caracteres são permitidos no nome de utilizador: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\""
 
 #: private/user/manager.php:237
 msgid "A valid username must be provided"
@@ -467,4 +477,4 @@ msgstr "Uma password válida deve ser fornecida"
 
 #: private/user/manager.php:246
 msgid "The username is already being used"
-msgstr ""
+msgstr "O nome de utilizador já está a ser usado"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 9a3d1b3728..11b4c05d8a 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -6,16 +6,17 @@
 # bmgmatias <bmgmatias@gmail.com>, 2013
 # Mouxy <daniel@mouxy.net>, 2013
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
-# Helder Meneses <helder.meneses@gmail.com>, 2013
+# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
 # jmruas <jmruas@gmail.com>, 2014
 # Nelson Rosado <nelsontrosado@gmail.com>, 2013
+# Drew Melim <nokostya.translation@gmail.com>, 2014
 # PapiMigas Migas <papimigas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +28,7 @@ msgstr ""
 #: admin/controller.php:66
 #, php-format
 msgid "Invalid value supplied for %s"
-msgstr ""
+msgstr "Valor dado a %s éinválido"
 
 #: admin/controller.php:73
 msgid "Saved"
@@ -39,12 +40,12 @@ msgstr "testar configurações de email"
 
 #: admin/controller.php:91
 msgid "If you received this email, the settings seem to be correct."
-msgstr ""
+msgstr "Se você recebeu este e-mail as configurações parecem estar correctas"
 
 #: admin/controller.php:94
 msgid ""
 "A problem occurred while sending the e-mail. Please revisit your settings."
-msgstr ""
+msgstr "Ocorreu um erro ao enviar o email. Por favor verifique as definições."
 
 #: admin/controller.php:99
 msgid "Email sent"
@@ -52,19 +53,19 @@ msgstr "E-mail enviado"
 
 #: admin/controller.php:101
 msgid "You need to set your user email before being able to send test emails."
-msgstr ""
+msgstr "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste"
 
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Modo de envio"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Encriptação"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
-msgstr ""
+msgstr "Método de autenticação"
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
@@ -93,17 +94,27 @@ msgstr "Impossível acrescentar o grupo"
 
 #: ajax/decryptall.php:31
 msgid "Files decrypted successfully"
-msgstr ""
+msgstr "Ficheiros desencriptados com sucesso"
 
 #: ajax/decryptall.php:33
 msgid ""
 "Couldn't decrypt your files, please check your owncloud.log or ask your "
 "administrator"
-msgstr ""
+msgstr "Não foi possível desencriptar os seus arquivos. Verifique a sua owncloud.log ou pergunte ao seu administrador"
 
 #: ajax/decryptall.php:36
 msgid "Couldn't decrypt your files, check your password and try again"
-msgstr ""
+msgstr "Não foi possível desencriptar os seus arquivos.  Verifique a sua senha e tente novamente"
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "A chave de encriptação foi eliminada permanentemente"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador"
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
@@ -121,6 +132,16 @@ msgstr "Impossível apagar grupo"
 msgid "Unable to delete user"
 msgstr "Impossível apagar utilizador"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Cópias de segurança foram restauradas com sucesso"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Nao foi possivel restaurar as suas chaves de encriptacao. Verifique a sua owncloud.log ou pergunte ao seu administrador"
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Idioma alterado"
@@ -176,7 +197,7 @@ msgstr "Não foi possível alterar a sua palavra-passe, mas a chave de encripta
 msgid "Unable to change password"
 msgstr "Não foi possível alterar a sua password"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "A enviar..."
 
@@ -186,7 +207,7 @@ msgstr "Documentação de Utilizador"
 
 #: js/apps.js:50
 msgid "Admin Documentation"
-msgstr ""
+msgstr "Documentação de administrador."
 
 #: js/apps.js:67
 msgid "Update to {appversion}"
@@ -232,34 +253,42 @@ msgstr "Actualizar"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Seleccione uma fotografia de perfil"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
-msgstr ""
+msgstr "Password muito fraca"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
-msgstr ""
+msgstr "Password fraca"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
-msgstr ""
+msgstr "Password aceitável"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
-msgstr ""
+msgstr "Password Forte"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
-msgstr ""
+msgstr "Password muito forte"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "apagado"
@@ -305,7 +334,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -339,11 +368,11 @@ msgstr "Login"
 
 #: templates/admin.php:18
 msgid "Plain"
-msgstr ""
+msgstr "Plano"
 
 #: templates/admin.php:19
 msgid "NT LAN Manager"
-msgstr ""
+msgstr "Gestor de NT LAN"
 
 #: templates/admin.php:24
 msgid "SSL"
@@ -450,18 +479,18 @@ msgstr "Cron"
 #: templates/admin.php:167
 #, php-format
 msgid "Last cron was executed at %s."
-msgstr ""
+msgstr "O ultimo 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 ""
+msgstr "O ultima cron foi executado em %s a mais duma hora. Algo não está certo."
 
 #: templates/admin.php:174
 msgid "Cron was not executed yet!"
-msgstr ""
+msgstr "Cron ainda não foi executado!"
 
 #: templates/admin.php:184
 msgid "Execute one task with each page loaded"
@@ -493,148 +522,143 @@ msgstr "Permitir que os utilizadores usem a API de partilha"
 msgid "Allow links"
 msgstr "Permitir links"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Permitir Envios Públicos"
 
-#: 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:230
+msgid "Set default expiration date"
+msgstr "Especificar a data padrão de expiração"
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr "Expira após"
 
 #: templates/admin.php:235
+msgid "days"
+msgstr "dias"
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr "Forçar a data de expiração"
+
+#: templates/admin.php:242
+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:252
 msgid "Allow resharing"
 msgstr "Permitir repartilha"
 
-#: templates/admin.php:236
+#: templates/admin.php:253
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que os utilizadores partilhem itens partilhados com eles"
 
-#: templates/admin.php:243
+#: templates/admin.php:260
 msgid "Allow users to share with anyone"
 msgstr "Permitir que os utilizadores partilhem com todos"
 
-#: templates/admin.php:246
+#: templates/admin.php:263
 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:253
+#: templates/admin.php:270
 msgid "Allow mail notification"
 msgstr "Permitir notificação por email"
 
-#: templates/admin.php:254
+#: templates/admin.php:271
 msgid "Allow users to send mail notification for shared files"
-msgstr ""
+msgstr "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados"
 
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
-
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Segurança"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Forçar HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "Servidor de email"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Isto é utilizado para enviar notificações"
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Do endereço"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Autenticação necessária"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Endereço do servidor"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Porto"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Credenciais"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "Nome de utilizador SMTP"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "Password SMTP"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Testar configurações de email"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Enviar email"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Registo"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Nível do registo"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -745,7 +769,7 @@ msgstr "O seu endereço de email"
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
-msgstr ""
+msgstr "Preencha com um endereço e-mail para permitir a recuperação de senha e receber notificações"
 
 #: templates/personal.php:89
 msgid "Profile picture"
@@ -787,29 +811,33 @@ msgstr "Idioma"
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Password de entrada"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Desencriptar todos os ficheiros"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves.  Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Restaurar as chaves de encriptação"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Apagar as chaves de encriptação"
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Nome de utilizador"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 926c61b319..c9c5938563 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,7 @@ msgstr "A configuração está correcta, mas não foi possível estabelecer o \"
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
-msgstr ""
+msgstr "A configuração é inválida. Por favor, veja o log do ownCloud para mais detalhes."
 
 #: ajax/wizard.php:32
 msgid "No action specified"
@@ -90,65 +90,65 @@ msgstr "Sucesso"
 msgid "Error"
 msgstr "Erro"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuração OK"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Configuração incorreta"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Configuração incompleta"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Seleccionar grupos"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Selecionar classes de objetos"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Selecionar atributos"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Teste de conecção passado com sucesso."
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Erro no teste de conecção."
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Deseja realmente apagar as configurações de servidor actuais?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Confirmar a operação de apagar"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s grupo encontrado"
 msgstr[1] "%s grupos encontrados"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s utilizador encontrado"
 msgstr[1] "%s utilizadores encontrados"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Hospedeiro Inválido"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Não se encontrou a função desejada"
 
@@ -271,7 +271,7 @@ msgstr "Pode especificar o ND Base para utilizadores e grupos no separador Avan
 #: templates/part.wizard-userfilter.php:4
 #, php-format
 msgid "Limit %s access to users meeting these criteria:"
-msgstr ""
+msgstr "Limitar o acesso a %s de utilizadores com estes critérios:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -501,7 +501,7 @@ msgid ""
 "You must make sure that the attribute of your choice can be fetched for both"
 " users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Por defeito, o ownCloud detecta automaticamente o atributo UUID. Este atributo é usado para identificar inequivocamente grupos e utilizadores LDAP. Igualmente, o nome de utilizador interno é criado com base no UUID, se o contrário não for especificado. Pode sobrepor esta definição colocando um atributo à sua escolha. Tenha em atenção que esse atributo deve ser válido tanto para grupos como para utilizadores, e que é único. Deixe em branco para optar pelo comportamento por defeito. Estas alteração apenas terão efeito em novos utilizadores e grupos mapeados (adicionados)."
 
 #: templates/settings.php:58
 msgid "UUID Attribute for Users:"
@@ -527,7 +527,7 @@ msgid ""
 " is not configuration sensitive, it affects all LDAP configurations! Never "
 "clear the mappings in a production environment, only in a testing or "
 "experimental stage."
-msgstr ""
+msgstr "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestígios em todo o lado. A limpeza dos mapeamentos não é sensível à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental."
 
 #: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 2e27cacbbe..41d9ad15e7 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 19:20+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -62,79 +62,79 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Duminică"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Luni"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Marți"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Joi"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Vineri"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sâmbătă"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Ianuarie"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februarie"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Martie"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Aprilie"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Iunie"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Iulie"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "August"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Septembrie"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Octombrie"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Noiembrie"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Decembrie"
 
@@ -198,76 +198,76 @@ msgstr "ultimul an"
 msgid "years ago"
 msgstr "ani în urmă"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Alege"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nu"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Alege"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Un conflict de fișier"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Ce fișiere vrei să păstrezi?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Anulare"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Continuă"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -299,12 +299,12 @@ msgstr "Partajat"
 msgid "Share"
 msgstr "Partajează"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Eroare"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Eroare la partajare"
 
@@ -332,107 +332,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Protejare cu parolă"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Parolă"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Permiteţi încărcarea publică."
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Expediază legătura prin poșta electronică"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Expediază"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Specifică data expirării"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Data expirării"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Distribuie prin email:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Nici o persoană găsită"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grup"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Repartajarea nu este permisă"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Distribuie in {item} si {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Anulare partajare"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "poate edita"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "control acces"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "actualizare"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "ștergere"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "partajare"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Protejare cu parolă"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Eroare la anularea datei de expirare"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Eroare la specificarea datei de expirare"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Se expediază..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Mesajul a fost expediat"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Atenție"
 
@@ -676,6 +685,10 @@ msgstr "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crează un <strong>cont de administrator</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Parolă"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 72e67b0dc9..93c2583591 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -9,14 +9,15 @@
 # corneliu.e <corneliueva@yahoo.com>, 2013
 # dimaursu16 <dima@ceata.org>, 2013
 # inaina <ina.c.ina@gmail.com>, 2013
+# lauraberindei <lauraagavriloae@yahoo.com>, 2014
 # ripkid666 <ripkid666@gmail.com>, 2013
 # sergiu_sechel <sergiu.sechel@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -35,7 +36,7 @@ msgstr "%s nu se poate muta - Fișierul cu acest nume există deja "
 msgid "Could not move %s"
 msgstr "Nu se poate muta %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Numele fișierului nu poate rămâne gol."
 
@@ -44,23 +45,23 @@ msgstr "Numele fișierului nu poate rămâne gol."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" este un nume de fișier nevalid"
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nume nevalide, '\\', '/', '<', '>', ':', '\"', '|', '?' și '*' nu sunt permise."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Dosarul țintă a fost mutat sau șters."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
-msgstr ""
+msgstr "Numele %s este deja este folosit în dosarul %s. Te rog alege alt nume."
 
 #: ajax/newfile.php:97
 msgid "Not a valid source"
@@ -69,7 +70,7 @@ msgstr "Sursă nevalidă"
 #: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
+msgstr "Serverului nu ii este permis sa deschida URL-ul , verificati setarile serverului"
 
 #: ajax/newfile.php:118
 #, php-format
@@ -147,28 +148,32 @@ msgstr "Încărcare eșuată. Nu se pot obține informații despre fișier."
 msgid "Invalid directory."
 msgstr "Dosar nevalid."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Fișiere"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Mărimea fișierului este {size1} ce depășește limita de incarcare de {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr "Spațiu liber insuficient, încărcați {size1} însă doar {size2} disponibil rămas"
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Încărcare anulată."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Nu se poate obține rezultatul de la server."
 
@@ -181,134 +186,138 @@ msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerup
 msgid "URL cannot be empty"
 msgstr "URL nu poate fi gol"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} există deja"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Nu s-a putut crea fisierul"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Nu s-a putut crea folderul"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Eroare încarcare URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Partajează"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Șterge permanent"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Redenumește"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Eroare la mutarea fișierului"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Eroare"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "În așteptare"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Eroare la mutarea fișierului."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Eroare la mutarea fișierului"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Eroare"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Nu s-a putut redenumi fisierul"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Eroare la ștergerea fisierului."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Nume"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Mărime"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Modificat"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n director"
 msgstr[1] "%n directoare"
 msgstr[2] "%n directoare"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 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:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} și {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Se încarcă %n fișier."
 msgstr[1] "Se încarcă %n fișiere."
 msgstr[2] "Se încarcă %n fișiere."
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" este un nume de fișier nevalid."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Spațiul de stocare este plin, fișierele nu mai pot fi actualizate sau sincronizate!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Spațiul de stocare este aproape plin ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
-msgstr ""
+msgstr "Aplicatia de criptare este activata dar tastatura nu este initializata , va rugam deconectati-va si reconectati-va"
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
-msgstr ""
+msgstr "Cheie privată nevalidă pentru aplicația Încriptare. Te rog, actualizează-ți parola cheii private folosind setările personale pentru a reaccesa fișierele tale încriptate."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele"
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} și {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Nume"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Mărime"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Modificat"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s nu a putut fi redenumit"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Încarcă (max. %s)"
@@ -345,68 +354,75 @@ msgstr "Dimensiunea maximă de intrare pentru fișierele ZIP"
 msgid "Save"
 msgstr "Salvează"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Folosește această adresă <a href=\"%s\" target=\"_blank\">pentru acces la fișierele tale folosind WebDAV</a>"
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Nou"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Un nou fișier text"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Fișier text"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Un nou dosar"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Dosar"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "De la adresa"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Fișiere șterse"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Anulează încărcarea"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Nimic aici. Încarcă ceva!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Șterge"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Fișierul încărcat este prea mare"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Fișierele sunt scanate, te rog așteaptă."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "În curs de scanare"
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index 137e05d929..18f2e0739a 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -18,6 +18,166 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Locație"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Gazdă"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Nume utilizator"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Parolă"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Partajează"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Acces permis"
@@ -42,29 +202,29 @@ msgstr "Eroare la configurarea mediului de stocare Google Drive"
 msgid "Saved"
 msgstr "Salvat"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index f7f4f9bc0f..089843a10c 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -58,16 +58,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Descarcă"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index dbec3636ed..e0cabb38bf 100644
--- a/l10n/ro/files_trashbin.po
+++ b/l10n/ro/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Sterge fisierele"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Eroare"
-
-#: 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 "Nume"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Eroare"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Nume"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Șterge"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index c749df94cd..6af2b4d508 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -18,12 +18,15 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -74,23 +77,23 @@ msgstr "Imagine invalidă"
 msgid "web services under your control"
 msgstr "servicii web controlate de tine"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Descărcarea ZIP este dezactivată."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Fișierele trebuie descărcate unul câte unul."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Înapoi la fișiere"
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -276,19 +279,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s Partajat »%s« cu tine de"
@@ -330,73 +333,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Cloud nu a gasit categoria \"%s\""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 85daa2a84f..3069e09704 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -50,15 +50,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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Modul de expediere"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Încriptare"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Modul de autentificare"
 
@@ -101,6 +101,16 @@ msgstr "Nu s-a puput decripta fișierele tale, verifică owncloud.log sau între
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Nu s-a puput decripta fișierele tale, verifică parola și  încearcă din nou"
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "E-mail salvat"
@@ -117,6 +127,16 @@ msgstr "Nu s-a putut șterge grupul"
 msgid "Unable to delete user"
 msgstr "Nu s-a putut șterge utilizatorul"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Limba a fost schimbată"
@@ -172,7 +192,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr "Imposibil de schimbat parola"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Se expediază..."
 
@@ -228,34 +248,42 @@ msgstr "Actualizare"
 msgid "Updated"
 msgstr "Actualizat"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Selectează o imagine de profil"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Parolă foarte slabă"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Parolă slabă"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Decriptare fișiere... Te rog așteaptă, poate dura ceva timp."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "șters"
@@ -301,7 +329,7 @@ msgstr "Trebuie să furnizaţi o parolă validă"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Avertizare: Dosarul Acasă pentru utilizatorul \"{user}\" deja există"
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "_language_name_"
 
@@ -489,148 +517,143 @@ msgstr "Permite aplicațiilor să folosească API-ul de partajare"
 msgid "Allow links"
 msgstr "Pemite legături"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Permite încărcări publice"
 
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permite utilizatorilor sa activeze opțiunea de încărcare a fișierelor în dosarele lor publice de către alte persoane"
-
-#: templates/admin.php:235
-msgid "Allow resharing"
-msgstr "Permite repartajarea"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Permite utilizatorilor să partajeze cu oricine"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Permite notificări prin e-mail"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune"
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
+#: templates/admin.php:242
+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:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Permite repartajarea"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Permite utilizatorilor să repartajeze fișiere partajate cu ei"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Permite utilizatorilor să partajeze cu oricine"
+
+#: templates/admin.php:263
+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:270
+msgid "Allow mail notification"
+msgstr "Permite notificări prin e-mail"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune"
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Securitate"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forțează clienții să se conecteze la %s folosind o conexiune sigură"
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Adresa server-ului"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Portul"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "Nume utilizator SMTP"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "Parolă SMTP"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Verifică setările de e-mail"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Expediază mesajul"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Jurnal de activitate"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Nivel jurnal"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Mai mult"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Mai puțin"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versiunea"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -783,29 +806,33 @@ msgstr "Limba"
 msgid "Help translate"
 msgstr "Ajută la traducere"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Folosește această adresă <a href=\"%s\" target=\"_blank\">pentru acces la fișierele tale folosind WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Parolă"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Decriptează toate fișierele"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Autentificare"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index e4dca6cb3c..36804f7392 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# lauraberindei <lauraagavriloae@yahoo.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: lauraberindei <lauraagavriloae@yahoo.com>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +28,7 @@ msgstr ""
 
 #: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Configuraţia este valida şi s-a stabilit conectarea"
 
 #: ajax/testConfiguration.php:42
 msgid ""
@@ -43,11 +44,11 @@ msgstr ""
 
 #: ajax/wizard.php:32
 msgid "No action specified"
-msgstr ""
+msgstr "Nu este specificata nici o acţiune "
 
 #: ajax/wizard.php:38
 msgid "No configuration specified"
-msgstr ""
+msgstr "Nu este specificata nici o configurare "
 
 #: ajax/wizard.php:81
 msgid "No data specified"
@@ -68,11 +69,11 @@ msgstr ""
 
 #: js/settings.js:84
 msgid "Keep settings?"
-msgstr ""
+msgstr "Păstraţi setările ?"
 
 #: js/settings.js:99
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Nu se poate adăuga configuraţia serverului "
 
 #: js/settings.js:127
 msgid "mappings cleared"
@@ -86,47 +87,47 @@ msgstr "Succes"
 msgid "Error"
 msgstr "Eroare"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
-msgstr ""
+msgstr "Configuraţie valida"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
-msgstr ""
+msgstr "Configuraţie incorecta "
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
-msgstr ""
+msgstr "Configuraţie incompleta "
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
-msgstr ""
+msgstr "Selectaţi grupuri "
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
-msgstr ""
+msgstr "Selectaţi caracteristici"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "Testul de conectare a reuşit "
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
-msgstr ""
+msgstr "Testul de conectare a eşuat "
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Sunteţi sigur ca vreţi sa ştergeţi configuraţia actuala a serverului ?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Confirmaţi Ştergerea "
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -134,7 +135,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -142,11 +143,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -156,7 +157,7 @@ msgstr "Salvează"
 
 #: templates/part.settingcontrols.php:4
 msgid "Test Configuration"
-msgstr ""
+msgstr "Configurare test"
 
 #: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
 msgid "Help"
@@ -213,7 +214,7 @@ msgstr ""
 
 #: templates/part.wizard-loginfilter.php:24
 msgid "Other Attributes:"
-msgstr ""
+msgstr "Alte caracteristici :"
 
 #: templates/part.wizard-loginfilter.php:38
 #, php-format
@@ -224,7 +225,7 @@ msgstr ""
 
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Adăugaţi Configuraţia Serverului"
 
 #: templates/part.wizard-server.php:30
 msgid "Host"
@@ -279,7 +280,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:38
 msgid "users found"
-msgstr ""
+msgstr "Utilizatori găsiţi "
 
 #: templates/part.wizardcontrols.php:5
 msgid "Back"
@@ -304,11 +305,11 @@ msgstr "<b>Atenție</b> Modulul PHP LDAP nu este instalat, infrastructura nu va
 
 #: templates/settings.php:20
 msgid "Connection Settings"
-msgstr ""
+msgstr "Setările de conexiune"
 
 #: templates/settings.php:22
 msgid "Configuration Active"
-msgstr ""
+msgstr "Configuraţie activa "
 
 #: templates/settings.php:22
 msgid "When unchecked, this configuration will be skipped."
@@ -330,7 +331,7 @@ msgstr ""
 
 #: templates/settings.php:25
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Dezactivaţi serverul principal"
 
 #: templates/settings.php:25
 msgid "Only connect to the replica server."
@@ -361,7 +362,7 @@ msgstr "în secunde. O schimbare curăță memoria tampon."
 
 #: templates/settings.php:30
 msgid "Directory Settings"
-msgstr ""
+msgstr "Setările directorului"
 
 #: templates/settings.php:32
 msgid "User Display Name Field"
@@ -434,7 +435,7 @@ msgstr ""
 
 #: templates/settings.php:42
 msgid "Special Attributes"
-msgstr ""
+msgstr "Caracteristici speciale "
 
 #: templates/settings.php:44
 msgid "Quota Field"
@@ -464,7 +465,7 @@ msgstr "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, sp
 
 #: templates/settings.php:53
 msgid "Internal Username"
-msgstr ""
+msgstr "Nume utilizator intern"
 
 #: templates/settings.php:54
 msgid ""
diff --git a/l10n/ro/user_webdavauth.po b/l10n/ro/user_webdavauth.po
index a4507bddf3..5ef7dcd74f 100644
--- a/l10n/ro/user_webdavauth.po
+++ b/l10n/ro/user_webdavauth.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Dimon Pockemon <>, 2013
+# lauraberindei <lauraagavriloae@yahoo.com>, 2014
 # laurentiucristescu <laur.cristescu@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-07 01:55-0400\n"
+"PO-Revision-Date: 2014-05-05 14:49+0000\n"
+"Last-Translator: lauraberindei <lauraagavriloae@yahoo.com>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,15 +20,15 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "WebDAV Authentication"
 msgstr "Autentificare WebDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "Address: "
-msgstr ""
+msgstr "Adresa :"
 
-#: 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/ru/core.po b/l10n/ru/core.po
index ce2d8e5a1e..4138f0ff4c 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -75,212 +75,212 @@ msgstr "Временная картинка профиля недоступна,
 msgid "No crop data provided"
 msgstr "Не указана информация о кадрировании"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Понедельник"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Среда"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Четверг"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Пятница"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Суббота"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Январь"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Февраль"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Март"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Апрель"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Май"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Июнь"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Июль"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Август"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Сентябрь"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Октябрь"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Ноябрь"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Декабрь"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Конфигурация"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Сохранение..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "несколько секунд назад"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n минуту назад"
 msgstr[1] "%n минуты назад"
 msgstr[2] "%n минут назад"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n час назад"
 msgstr[1] "%n часа назад"
 msgstr[2] "%n часов назад"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "сегодня"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n день назад"
 msgstr[1] "%n дня назад"
 msgstr[2] "%n дней назад"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "в прошлом месяце"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n месяц назад"
 msgstr[1] "%n месяца назад"
 msgstr[2] "%n месяцев назад"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "в прошлом году"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "несколько лет назад"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Выбрать"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Ошибка при загрузке шаблона выбора файлов: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Да"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Нет"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Выбрать"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Ошибка при загрузке шаблона выбора файлов: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ок"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Ошибка загрузки шаблона сообщений: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} конфликт в файлах"
 msgstr[1] "{count} конфликта в файлах"
 msgstr[2] "{count} конфликтов в файлах"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Один конфликт в файлах"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Новые файлы"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Какие файлы вы хотите сохранить?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "При выборе обоих версий,  к названию копируемого файла будет добавлена цифра"
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Отменить"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Продолжить"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(выбраны все)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} выбрано)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Ошибка при загрузке шаблона существующего файла"
 
@@ -312,12 +312,12 @@ msgstr "Общие"
 msgid "Share"
 msgstr "Открыть доступ"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Ошибка при открытии доступа"
 
@@ -345,107 +345,116 @@ msgstr "Поделиться с пользователем или группой
 msgid "Share link"
 msgstr "Поделиться ссылкой"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Защитить паролем"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Пароль"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Разрешить открытую загрузку"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Почтовая ссылка на персону"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Отправить"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Установить срок доступа"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Дата окончания"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Поделится через электронную почту:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Ни один человек не найден"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "группа"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Общий доступ не разрешен"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Общий доступ к {item} с {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Закрыть общий доступ"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "уведомить по почте"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "может редактировать"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "контроль доступа"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "создать"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "обновить"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "удалить"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "открыть доступ"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Защищено паролем"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Ошибка при отмене срока доступа"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Ошибка при установке срока доступа"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Отправляется ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Письмо отправлено"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Предупреждение"
 
@@ -689,6 +698,10 @@ msgstr "Для информации, как правильно настроит
 msgid "Create an <strong>admin account</strong>"
 msgstr "Создать <strong>учётную запись администратора</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Пароль"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Система хранения данных & база данных"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 8593f90185..3ff72cdf55 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -20,9 +20,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 07:30+0000\n"
-"Last-Translator: Denis Plastinin <denispal@gmail.com>\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +40,7 @@ msgstr "Невозможно переместить %s - файл с таким
 msgid "Could not move %s"
 msgstr "Невозможно переместить %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Имя файла не может быть пустым."
 
@@ -49,18 +49,18 @@ msgstr "Имя файла не может быть пустым."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" это не правильное имя файла."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Неправильное имя: символы '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Целевой каталог был перемещен или удален."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -152,28 +152,32 @@ msgstr "Загрузка не удалась. Невозможно получи
 msgid "Invalid directory."
 msgstr "Неверный каталог."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Файлы"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Невозможно загрузить {filename}, так как это либо каталог, либо файл нулевого размера"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Полный размер файла {size1} превышает лимит по загрузке {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr "Не достаточно свободного места, Вы загружаете {size1} но осталось только {size2}"
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Загрузка отменена."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Не удалось получить ответ от сервера."
 
@@ -186,134 +190,138 @@ msgstr "Идёт загрузка файла. Покинув страницу, 
 msgid "URL cannot be empty"
 msgstr "Ссылка не может быть пустой."
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} уже существует"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Не удалось создать файл"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Не удалось создать каталог"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Ошибка получения URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Открыть доступ"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Удалить окончательно"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Переименовать"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Ошибка при перемещении файла"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Идёт подготовка к скачиванию. Это может занять некоторое время, если файлы большого размера."
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Ошибка"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Ожидание"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Ошибка при перемещении файла"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Ошибка"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Не удалось переименовать файл"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Ошибка при удалении файла."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Имя"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Размер"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Дата изменения"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n каталог"
 msgstr[1] "%n каталога"
 msgstr[2] "%n каталогов"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n файл"
 msgstr[1] "%n файла"
 msgstr[2] "%n файлов"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} и {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Закачка %n файла"
 msgstr[1] "Закачка %n файлов"
 msgstr[2] "Закачка %n файлов"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" это не правильное имя файла."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Ваше хранилище заполнено, произведите очистку перед загрузкой новых файлов."
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше хранилище почти заполнено ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Приложение для шифрования активно, но ваши ключи не инициализированы, пожалуйста, перелогиньтесь"
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Шифрование было отключено, но ваши файлы остались зашифрованными. Зайдите на страницу личных настроек для того, чтобы расшифровать их."
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
-msgstr "Идёт подготовка к скачиванию. Это может занять некоторое время, если файлы большого размера."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} и {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Имя"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Размер"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Дата изменения"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s не может быть переименован"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Загружено (max. %s)"
@@ -350,68 +358,75 @@ msgstr "Максимальный исходный размер для ZIP фай
 msgid "Save"
 msgstr "Сохранить"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Новый"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Новый текстовый файл"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Текстовый файл"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Новый каталог"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Каталог"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Объект по ссылке"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Удалённые файлы"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Отменить загрузку"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr "У вас нет прав для загрузки или создания файлов здесь."
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Здесь ничего нет. Загрузите что-нибудь!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Файл слишком велик"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файлы, которые вы пытаетесь загрузить, превышают лимит максимального размера на этом сервере."
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Подождите, файлы сканируются."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Текущее сканирование"
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index d3611c51cc..2932a7a0fc 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -18,6 +18,166 @@ 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"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Локально"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Местоположение"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Сервер"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Имя пользователя"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Пароль"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Открыть доступ"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "Ссылка"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Доступ предоставлен"
@@ -42,29 +202,29 @@ msgstr "Ошибка при настройке хранилища Google Drive"
 msgid "Saved"
 msgstr "Сохранено"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 6797636fb1..ea340e487f 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# jekader <jekader@gmail.com>, 2014
 # mogarych <mogarych@mail.ru>, 2014
 # Victor Bravo <>, 2013
 # not_your_conscience <hex.void@gmail.com>, 2013
@@ -11,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"Last-Translator: jekader <jekader@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Доступ открыл {owner}"
 
@@ -61,16 +62,15 @@ msgstr "общий доступ отключён"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Пожалуйста, обратитесь к отправителю данной ссылки."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "Поделиться с %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Скачать"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
-msgstr ""
+msgstr "Скачать %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Прямая ссылка"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index 39a39c11b0..fd7945571a 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -29,38 +29,34 @@ msgstr "%s не может быть удалён навсегда"
 msgid "Couldn't restore %s"
 msgstr "%s не может быть восстановлен"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "Имя"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Восстановить"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Ошибка"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "восстановлен"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Здесь ничего нет. Ваша корзина пуста!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Имя"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Удалён"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Удалить"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 738a44e4a1..1580478d88 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -5,6 +5,7 @@
 # Translators:
 # Alexander Shashkevych <alex@stunpix.com>, 2013
 # jekader <jekader@gmail.com>, 2013
+# tukos <kalyuzhniy@gmail.com>, 2014
 # eurekafag <rkfg@rkfg.me>, 2013
 # sk.avenger <sk.avenger@adygnet.ru>, 2013
 # unixoid <victor.ashirov@gmail.com>, 2013
@@ -14,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -24,12 +25,15 @@ 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"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -80,23 +84,23 @@ msgstr "Изображение повреждено"
 msgid "web services under your control"
 msgstr "веб-сервисы под вашим управлением"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP-скачивание отключено."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Файлы должны быть загружены по одному."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Назад к файлам"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Выбранные файлы слишком велики, чтобы создать zip файл."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -172,7 +176,7 @@ msgstr "Токен просрочен. Перезагрузите страниц
 
 #: private/json.php:74
 msgid "Unknown user"
-msgstr ""
+msgstr "Неизвестный пользователь"
 
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
@@ -214,7 +218,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
@@ -242,20 +246,20 @@ msgstr "Вызываемая команда была: \"%s\""
 #: private/setup/mysql.php:85
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "Пользователь MySQL '%s'@'localhost' уже существует."
 
 #: private/setup/mysql.php:86
 msgid "Drop this user from MySQL/MariaDB"
-msgstr ""
+msgstr "Удалить данного участника из MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "Пользователь MySQL '%s'@'%%' уже существует."
 
 #: 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"
@@ -282,19 +286,19 @@ msgstr "Установить имя пользователя для admin."
 msgid "Set an admin password."
 msgstr "становит пароль для admin."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>."
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s поделился »%s« с вами"
@@ -307,12 +311,12 @@ msgstr ""
 #: private/share/share.php:523
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
-msgstr ""
+msgstr "Не удалось установить общий доступ для %s, пользователь %s уже  является владельцем"
 
 #: private/share/share.php:529
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
-msgstr ""
+msgstr "Не удалось установить общий доступ для %s, пользователь %s не существует."
 
 #: private/share/share.php:538
 #, php-format
@@ -324,85 +328,91 @@ msgstr ""
 #: private/share/share.php:551 private/share/share.php:579
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
-msgstr ""
+msgstr "Не удалось установить общий доступ для %s ,в виду того что, объект уже находиться в общем доступе с %s"
 
 #: private/share/share.php:559
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
-msgstr ""
+msgstr "Не удалось установить общий доступ для %s, группа %s не существует."
 
 #: private/share/share.php:566
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr "Не удалось установить общий доступ для %s, %s не является членом группы %s"
+
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
-msgstr ""
+msgstr "Не удалось установить общий доступ для %s, потому что обмен со ссылками не допускается"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
-msgstr ""
+msgstr "Такой втд общего доступа как %s не допустим для %s"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
-msgstr ""
+msgstr "Настройка прав доступа для %s невозможна, поскольку права доступа превышают предоставленные права доступа %s"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
-msgstr ""
+msgstr "Не удалось произвести настройку прав доступа для %s , элемент не был найден."
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Категория \"%s\"  не найдена"
@@ -463,7 +473,7 @@ msgstr "несколько лет назад"
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "Только следующие символы допускаются в имени пользователя: \"a-z\", \"A-Z\", \"0-9\", и \"_.@-\""
 
 #: private/user/manager.php:237
 msgid "A valid username must be provided"
@@ -475,4 +485,4 @@ msgstr "Укажите валидный пароль"
 
 #: private/user/manager.php:246
 msgid "The username is already being used"
-msgstr ""
+msgstr "Имя пользователя уже используется"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index cd956b5704..29cf373d44 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -8,6 +8,7 @@
 # alfsoft <alfsoft@gmail.com>, 2013
 # lord93 <lordakryl@gmail.com>, 2013
 # Denis Plastinin <denispal@gmail.com>, 2014
+# Denis Plastinin <denispal@gmail.com>, 2014
 # Evgeniy Spitsyn <evgeniy@spitsyn.net>, 2013
 # jekader <jekader@gmail.com>, 2013
 # eurekafag <rkfg@rkfg.me>, 2013
@@ -23,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -36,7 +37,7 @@ msgstr ""
 #: admin/controller.php:66
 #, php-format
 msgid "Invalid value supplied for %s"
-msgstr ""
+msgstr "Неверное значение для %s"
 
 #: admin/controller.php:73
 msgid "Saved"
@@ -44,16 +45,16 @@ 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"
@@ -61,19 +62,19 @@ msgstr "Письмо отправлено"
 
 #: admin/controller.php:101
 msgid "You need to set your user email before being able to send test emails."
-msgstr ""
+msgstr "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения."
 
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
-msgstr ""
+msgstr "Отправить сообщение"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Шифрование"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
-msgstr ""
+msgstr "Метод проверки подлинности"
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
@@ -114,6 +115,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Email сохранен"
@@ -130,6 +141,16 @@ msgstr "Невозможно удалить группу"
 msgid "Unable to delete user"
 msgstr "Невозможно удалить пользователя"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Язык изменён"
@@ -185,7 +206,7 @@ msgstr "Используемый механизм не поддерживает
 msgid "Unable to change password"
 msgstr "Невозможно изменить пароль"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Отправляется ..."
 
@@ -241,34 +262,42 @@ msgstr "Обновить"
 msgid "Updated"
 msgstr "Обновлено"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Выберите картинку профиля"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Очень слабый пароль"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Слабый пароль"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Так себе пароль"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Хороший пароль"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Устойчивый к взлому пароль"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "удален"
@@ -314,7 +343,7 @@ msgstr "Укажите валидный пароль"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Предупреждение: домашняя папка пользователя \"{user}\" уже существует"
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Русский "
 
@@ -502,148 +531,143 @@ msgstr "Позволить приложениям использовать API 
 msgid "Allow links"
 msgstr "Разрешить ссылки"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Разрешить пользователям открывать в общий доступ элементы с публичной ссылкой"
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Разрешить пользователям открывать в общий доступ элементы с публичной ссылкой"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Разрешить переоткрытие общего доступа"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Позволить пользователям открывать общий доступ к эллементам уже открытым в общий доступ"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Разрешить пользователя делать общий доступ любому"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "Разрешить пользователям делать общий доступ только для пользователей их групп"
+
 #: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
+msgstr "Разрешить уведомление по почте"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Безопасность"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Принудить к HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Принудить клиентов подключаться к %s через шифрованное соединение."
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Пожалуйста, подключитесь к %s используя HTTPS чтобы включить или отключить принудительное SSL."
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
-msgstr ""
+msgstr "Сервер почты"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
-msgstr ""
+msgstr "Используется для отправки уведомлений."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
-msgstr ""
+msgstr "Адрес отправителя"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
-msgstr ""
+msgstr "Требуется аутентификация "
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Адрес сервера"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Порт"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Полномочия"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "Имя пользователя"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "Пароль"
 
-#: templates/admin.php:387
-msgid "Test email settings"
-msgstr ""
-
 #: templates/admin.php:388
+msgid "Test email settings"
+msgstr "Тест настроек"
+
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Отправить сообщение"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Журнал"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Уровень детализации журнала"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Больше"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Меньше"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -675,7 +699,7 @@ msgstr "Смотрите дополнения на apps.owncloud.com"
 
 #: templates/apps.php:51
 msgid "See application website"
-msgstr ""
+msgstr "См. сайт приложений"
 
 #: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
@@ -796,29 +820,33 @@ msgstr "Язык"
 msgid "Help translate"
 msgstr "Помочь с переводом"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Приложение для шифрования выключено, пожалуйста, расшифруйте ваши файлы"
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Пароль входа"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Снять шифрование со всех файлов"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Имя пользователя"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 07dbddd68e..0f72cc6700 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -7,7 +7,7 @@
 # Fenuks <fenuksuh@ya.ru>, 2013
 # alfsoft <alfsoft@gmail.com>, 2013
 # Denis Plastinin <denispal@gmail.com>, 2014
-# jekader <jekader@gmail.com>, 2013
+# jekader <jekader@gmail.com>, 2013-2014
 # Евгений Белоусов <kvantor12@gmail.com>, 2013
 # mogarych <mogarych@mail.ru>, 2014
 # unixoid <victor.ashirov@gmail.com>, 2013
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 08:10+0000\n"
-"Last-Translator: Denis Plastinin <denispal@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: jekader <jekader@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -137,7 +137,7 @@ msgstr "Вы действительно хотите удалить сущест
 msgid "Confirm Deletion"
 msgstr "Подтверждение удаления"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -145,7 +145,7 @@ msgstr[0] "%s группа найдена"
 msgstr[1] "%s группы найдены"
 msgstr[2] "%s групп найдено"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -153,11 +153,11 @@ msgstr[0] "%s пользователь найден"
 msgstr[1] "%s пользователя найдено"
 msgstr[2] "%s пользователей найдено"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Неверный сервер"
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Не могу найти требуемой функциональности"
 
@@ -176,7 +176,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
@@ -212,7 +212,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:"
@@ -424,24 +424,24 @@ msgstr "Ассоциация Группа-Участник"
 
 #: templates/settings.php:39
 msgid "Nested Groups"
-msgstr ""
+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 ""
+msgstr "При включении, активируется поддержка групп, содержащих другие группы. (Работает только если атрибут член группы содержит DN.)"
 
 #: templates/settings.php:40
 msgid "Paging chunksize"
-msgstr ""
+msgstr "Постраничный 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 ""
+msgstr "ChunkSize используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Настройка его  в \"0\" отключает страничный поиск LDAP для таких ситуаций.)"
 
 #: templates/settings.php:42
 msgid "Special Attributes"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 29638affc8..e014bd29c2 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "ඉරිදා"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "සඳුදා"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "අඟහරුවාදා"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "බදාදා"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "බ්‍රහස්පතින්දා"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "සිකුරාදා"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "සෙනසුරාදා"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "ජනවාරි"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "පෙබරවාරි"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "මාර්තු"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "අප්‍රේල්"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "මැයි"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "ජූනි"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "ජූලි"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "අගෝස්තු"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "සැප්තැම්බර්"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "ඔක්තෝබර"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "නොවැම්බර්"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "දෙසැම්බර්"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "සිටුවම්"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "සුරැකෙමින් පවතී..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "තත්පරයන්ට පෙර"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "අද"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "ඊයේ"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "පෙර මාසයේ"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "පෙර අවුරුද්දේ"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "අවුරුදු කීපයකට පෙර"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "තෝරන්න"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "ඔව්"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "එපා"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "තෝරන්න"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "හරි"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "එපා"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr "බෙදා හදා ගන්න"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "දෝෂයක්"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "මුර පදයකින් ආරක්ශාකරන්න"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "මුර පදය"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "කල් ඉකුත් විමේ දිනය දමන්න"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "කල් ඉකුත් විමේ දිනය"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "විද්‍යුත් තැපෑල මඟින් බෙදාගන්න: "
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "කණ්ඩායම"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "නොබෙදු"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "සංස්කරණය කළ හැක"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "ප්‍රවේශ පාලනය"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "සදන්න"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "යාවත්කාලීන කරන්න"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "මකන්න"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "බෙදාහදාගන්න"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "මුර පදයකින් ආරක්ශාකර ඇත"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "අවවාදය"
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "මුර පදය"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 0a2c9f318c..8ab896e4e9 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "ගොනු"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "උඩුගත කිරීම අත් හරින්න ලදී"
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "බෙදා හදා ගන්න"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "නැවත නම් කරන්න"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "දෝෂයක්"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "දෝෂයක්"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "නම"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "ප්‍රමාණය"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "වෙනස් කළ"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "නම"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "ප්‍රමාණය"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "වෙනස් කළ"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr "ZIP ගොනු සඳහා දැමිය හැකි උපරි
 msgid "Save"
 msgstr "සුරකින්න"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "නව"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "පෙළ ගොනුව"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "ෆෝල්ඩරය"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "යොමුවෙන්"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "උඩුගත කිරීම අත් හරින්න"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "බාන්න"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "මකා දමන්න"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "උඩුගත කිරීම විශාල වැඩිය"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය"
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න"
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "වර්තමාන පරික්ෂාව"
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index 471f857964..8394a3d2ec 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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,6 +17,166 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "ස්ථානය"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "සත්කාරකය"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "පරිශීලක නම"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "මුර පදය"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "බෙදා හදා ගන්න"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "පිවිසීමට හැක"
@@ -41,29 +201,29 @@ msgstr "Google Drive ගබඩාව වින්‍යාස කිරීමේ
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index 58f715f18b..8688d68c79 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "බාන්න"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index c8ef3d0172..bf06153c10 100644
--- a/l10n/si_LK/files_trashbin.po
+++ b/l10n/si_LK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "නම"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "දෝෂයක්"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "නම"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "මකා දමන්න"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index e7fbe2f721..3c161f3e49 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP භාගත කිරීම් අක්‍රියයි"
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "ගොනු එකින් එක භාගත යුතුයි"
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "ගොනු වෙතට නැවත යන්න"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "තෝරාගත් ගොනු ZIP ගොනුවක් තැනීමට විශාල වැඩිය."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index fb60e08cda..56dc8af303 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "ගුප්ත කේතනය"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "වි-තැපෑල සුරකින ලදී"
@@ -114,6 +124,16 @@ msgstr "කණ්ඩායම මැකීමට නොහැක"
 msgid "Unable to delete user"
 msgstr "පරිශීලකයා මැකීමට නොහැක"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "භාෂාව ාවනස් කිරීම"
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr "යාවත්කාල කිරීම"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr "යොමු සලසන්න"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "යළි යළිත් හුවමාරුවට අවසර දෙමි"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "හුවමාරු කළ  හුවමාරුවට අවසර දෙමි"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "ඕනෑම අයෙකු හා හුවමාරුවට අවසර දෙමි"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "තම කණ්ඩායමේ අයෙකු හා පමණක් හුවමාරුවට අවසර දෙමි"
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "සේවාදායකයේ ලිපිනය"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "තොට"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "ලඝුව"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "වැඩි"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "අඩු"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr "භාෂාව"
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "ප්‍රවිශ්ටය"
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index 351223d7ba..4822885fee 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -86,65 +86,65 @@ msgstr "සාර්ථකයි"
 msgid "Error"
 msgstr "දෝෂයක්"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index d0b50414ec..b382ea460d 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,212 +58,212 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Pondelok"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Streda"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Piatok"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sobota"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Január"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Február"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Marec"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Apríl"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Máj"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Jún"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Júl"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "August"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Október"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "December"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -295,12 +295,12 @@ msgstr ""
 msgid "Share"
 msgstr "Zdieľať"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -328,107 +328,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "skupina"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -672,6 +681,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index 1a5f19fb30..37f042d3cf 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,134 +177,138 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Zdieľať"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -337,68 +345,75 @@ msgstr ""
 msgid "Save"
 msgstr "Uložiť"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/sk/files_external.po b/l10n/sk/files_external.po
index 55edeaf358..1352a7127d 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,166 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Poloha"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Zdieľať"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sk/files_sharing.po b/l10n/sk/files_sharing.po
index 1c1b6602df..0cad146d76 100644
--- a/l10n/sk/files_sharing.po
+++ b/l10n/sk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-04 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 06:11+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,7 +17,7 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Stiahnuť"
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/sk/files_trashbin.po b/l10n/sk/files_trashbin.po
index 11f7b773ea..c0ddba014a 100644
--- a/l10n/sk/files_trashbin.po
+++ b/l10n/sk/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Odstrániť"
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index de9e07230c..07a0b47a8d 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,15 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index b9f2f2eb06..1806dc6324 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 7cbb3c8c84..2fe6577c4b 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -60,212 +60,212 @@ msgstr "Dočasný profilový obrázok nie je k dispozícii, skúste to znovu"
 msgid "No crop data provided"
 msgstr "Dáta pre orezanie neboli zadané"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Pondelok"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Streda"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Piatok"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Sobota"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Január"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Február"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Marec"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Apríl"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Máj"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Jún"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Júl"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "August"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Október"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "December"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Ukladám..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "pred sekundami"
 
-#: js/js.js:1247
+#: js/js.js:1241
 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:1248
+#: js/js.js:1242
 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:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:1251
+#: js/js.js:1245
 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:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "minulý mesiac"
 
-#: js/js.js:1253
+#: js/js.js:1247
 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:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "pred rokmi"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Vybrať"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Chyba pri nahrávaní šablóny výberu súborov: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Áno"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nie"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Vybrať"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Chyba pri nahrávaní šablóny výberu súborov: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Chyba pri nahrávaní šablóny správy: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} konflikt súboru"
 msgstr[1] "{count} konflikty súboru"
 msgstr[2] "{count} konfliktov súboru"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Jeden konflikt súboru"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Nové súbory"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Už existujúce súbory"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Ktoré súbory chcete ponechať?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Pokračovať"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(všetko vybrané)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} vybraných)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Chyba pri nahrávaní šablóny existencie súboru"
 
@@ -297,12 +297,12 @@ msgstr "Zdieľané"
 msgid "Share"
 msgstr "Zdieľať"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Chyba"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Chyba počas zdieľania"
 
@@ -330,107 +330,116 @@ msgstr "Zdieľať s používateľom alebo skupinou ..."
 msgid "Share link"
 msgstr "Zdieľať linku"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Chrániť heslom"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Heslo"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Povoliť verejné nahrávanie"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Odoslať odkaz emailom"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Odoslať"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Nastaviť dátum expirácie"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Dátum expirácie"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Zdieľať cez email:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Používateľ nenájdený"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "skupina"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Zdieľanie už zdieľanej položky nie je povolené"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Zdieľané v {item} s {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Zrušiť zdieľanie"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "informovať emailom"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "môže upraviť"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "prístupové práva"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "vytvoriť"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "aktualizovať"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "vymazať"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "zdieľať"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Chránené heslom"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Chyba pri odstraňovaní dátumu expirácie"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Chyba pri nastavení dátumu expirácie"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Odosielam ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Email odoslaný"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Varovanie"
 
@@ -674,6 +683,10 @@ msgstr "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a h
 msgid "Create an <strong>admin account</strong>"
 msgstr "Vytvoriť <strong>administrátorský účet</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Heslo"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Úložislo & databáza"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 630e514b15..9bcbb4ac02 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 07:50+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +28,7 @@ msgstr "Nie je možné presunúť %s - súbor s týmto menom už existuje"
 msgid "Could not move %s"
 msgstr "Nie je možné presunúť %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Meno súboru nemôže byť prázdne"
 
@@ -37,18 +37,18 @@ msgstr "Meno súboru nemôže byť prázdne"
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" je neplatné meno súboru."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Cieľový priečinok bol premiestnený alebo odstránený."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -140,28 +140,32 @@ msgstr "Nahrávanie zlyhalo. Nepodarilo sa získať informácie o súbore."
 msgid "Invalid directory."
 msgstr "Neplatný priečinok."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Súbory"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má 0 bitov"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Celková veľkosť súboru {size1} prekračuje upload limit {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}"
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Odosielanie zrušené."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Nepodarilo sa dostať výsledky zo servera."
 
@@ -174,134 +178,138 @@ msgstr "Opustenie stránky zruší práve prebiehajúce odosielanie súboru."
 msgid "URL cannot be empty"
 msgstr "URL nemôže byť prázdna"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} už existuje"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Nemožno vytvoriť súbor"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Nemožno vytvoriť priečinok"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Chyba pri načítavaní URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Zdieľať"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Zmazať  trvalo"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Premenovať"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Chyba pri presúvaní súboru"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Chyba"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Prebieha"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Chyba pri presúvaní súboru"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Chyba"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Nemožno premenovať súbor"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Chyba pri mazaní súboru."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Názov"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Veľkosť"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Upravené"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 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:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 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:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} a {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Nahrávam %n súbor"
 msgstr[1] "Nahrávam %n súbory"
 msgstr[2] "Nahrávam %n súborov"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" je neplatné meno súboru."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Vaše úložisko je takmer plné ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste."
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Chybný súkromný kľúč na šifrovanie aplikácií. Zaktualizujte si heslo súkromného kľúča v svojom osobnom nastavení, aby ste znovu získali prístup k svojim zašifrovaným súborom."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} a {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Názov"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Veľkosť"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Upravené"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s nemohol byť premenovaný"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Nahrať (max. %s)"
@@ -338,68 +346,75 @@ msgstr "Najväčšia veľkosť ZIP súborov"
 msgid "Save"
 msgstr "Uložiť"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Nový"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Nový textový súbor"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Textový súbor"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Priečinok"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Z odkazu"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Zmazané súbory"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Zrušiť odosielanie"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Žiadny súbor. Nahrajte niečo!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Sťahovanie"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Zmazať"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Nahrávanie je príliš veľké"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Čakajte, súbory sú prehľadávané."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Práve prezerané"
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index 7054f3c2f5..8340c7737e 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 07:20+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,166 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Lokálny"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Umiestnenie"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Hostiteľ"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Používateľské meno"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Heslo"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Zdieľať"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Prístup povolený"
@@ -42,29 +202,29 @@ msgstr "Chyba pri konfigurácii úložiska Google drive"
 msgid "Saved"
 msgstr "Uložené"
 
-#: lib/config.php:598
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Poznámka:</b> "
 
-#: lib/config.php:608
+#: lib/config.php:599
 msgid " and "
 msgstr "a"
 
-#: lib/config.php:630
+#: lib/config.php:621
 #, 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 "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval."
 
-#: lib/config.php:632
+#: lib/config.php:623
 #, 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 "<b>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval."
 
-#: lib/config.php:634
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index fafef561bd..0fc2848f35 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 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"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Zdieľa {owner}"
 
@@ -58,16 +58,15 @@ msgstr "zdieľanie je zakázané"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "Zdieľa %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Sťahovanie"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Stiahnuť %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Priama linka"
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index e6224e89fc..bc4748a34b 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Nemožno zmazať %s navždy"
 msgid "Couldn't restore %s"
 msgstr "Nemožno obnoviť %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Zmazané súbory"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Chyba"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Zmazané súbory"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "obnovené"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Žiadny obsah. Kôš je prázdny!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Názov"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Obnoviť"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Chyba"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "obnovené"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Žiadny obsah. Kôš je prázdny!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Názov"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Zmazané"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Zmazať"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index e622440066..954844c290 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 07:40+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,16 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
-msgstr "Kontaktujte prosím vášho administrátora"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
 
 #: private/app.php:236
 #, php-format
@@ -75,23 +78,23 @@ msgstr "Chybný obrázok"
 msgid "web services under your control"
 msgstr "webové služby pod Vašou kontrolou"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Sťahovanie súborov ZIP je vypnuté."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Súbory musia byť nahrávané jeden za druhým."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Späť na súbory"
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -277,19 +280,19 @@ msgstr "Zadajte používateľské meno administrátora."
 msgid "Set an admin password."
 msgstr "Zadajte heslo administrátora."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s s vami zdieľa »%s«"
@@ -331,73 +334,79 @@ msgstr "Zdieľanie %s zlyhalo, pretože skupina %s neexistuje"
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Zdieľanie %s zlyhalo, pretože %s nie je členom skupiny %s"
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Zdieľanie %s zlyhalo, pretože zdieľanie odkazom nie je povolené"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Typ zdieľania %s nie je platný pre %s"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Nastavenie povolení pre %s zlyhalo, pretože povolenia prekračujú povolenia udelené %s"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Nastavenie povolení pre %s zlyhalo, pretože položka sa nenašla"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Nemožno nájsť danú kategóriu \"%s\""
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 490dc7d169..6dd4e4df22 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -49,15 +49,15 @@ msgstr "Email odoslaný"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Musíte nastaviť svoj po​​užívateľský email, než budete môcť odoslať testovací email."
 
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Mód odosielania"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Šifrovanie"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Autentifikačná metóda"
 
@@ -100,6 +100,16 @@ msgstr "Nemožno dešifrovať vaše súbory, skontrolujte svoj owncloud.log aleb
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Nemožno dešifrovať vaše súbory, skontrolujte svoje heslo a skúste to znova"
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Email uložený"
@@ -116,6 +126,16 @@ msgstr "Nie je možné odstrániť skupinu"
 msgid "Unable to delete user"
 msgstr "Nie je možné odstrániť používateľa"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Jazyk zmenený"
@@ -171,7 +191,7 @@ msgstr "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používate
 msgid "Unable to change password"
 msgstr "Zmena hesla sa nepodarila"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Odosielam..."
 
@@ -227,34 +247,42 @@ msgstr "Aktualizovať"
 msgid "Updated"
 msgstr "Aktualizované"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Vybrať avatara"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Veľmi slabé heslo"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Slabé heslo"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Priemerné heslo"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Dobré heslo"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Silné heslo"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "zmazané"
@@ -300,7 +328,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Slovensky"
 
@@ -488,148 +516,143 @@ msgstr "Povoliť aplikáciám používať API na zdieľanie"
 msgid "Allow links"
 msgstr "Povoliť odkazy"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Povoliť verejné nahrávanie súborov"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Povoliť zdieľanie ďalej"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Povoliť používateľom zdieľať s kýmkoľvek"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Povoliť odosielať upozornenia emailom"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov"
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr "Platnosť"
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr "dni"
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
+#: templates/admin.php:242
+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:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Povoliť zdieľanie ďalej"
+
+#: templates/admin.php:253
+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:260
+msgid "Allow users to share with anyone"
+msgstr "Povoliť používateľom zdieľať s kýmkoľvek"
+
+#: templates/admin.php:263
+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:270
+msgid "Allow mail notification"
+msgstr "Povoliť odosielať upozornenia emailom"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov"
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Zabezpečenie"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Vynútiť HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "Email server"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Používa sa na odosielanie upozornení."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Z adresy"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Vyžaduje sa overenie"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Adresa servera"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Prihlasovanie údaje"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "SMTP používateľské meno"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "SMTP heslo"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Nastavenia testovacieho emailu"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Odoslať email"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Úroveň záznamu"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Viac"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Menej"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Verzia"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -782,29 +805,33 @@ msgstr "Jazyk"
 msgid "Help translate"
 msgstr "Pomôcť s prekladom"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Prihlasovacie heslo"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Dešifrovať všetky súbory"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Prihlasovacie meno"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 255c325f54..c626531885 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 07:30+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -88,47 +88,47 @@ msgstr "Úspešné"
 msgid "Error"
 msgstr "Chyba"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfigurácia je v poriadku"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Nesprávna konfigurácia"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Nekompletná konfigurácia"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Vybrať skupinu"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Vyberte triedy objektov"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Vyberte atribúty"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Test pripojenia bol úspešný"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Test pripojenia zlyhal"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Naozaj chcete zmazať súčasné nastavenie servera?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Potvrdiť vymazanie"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -136,7 +136,7 @@ msgstr[0] "%s nájdená skupina"
 msgstr[1] "%s nájdené skupiny"
 msgstr[2] "%s nájdených skupín"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -144,11 +144,11 @@ msgstr[0] "%s nájdený používateľ"
 msgstr[1] "%s nájdení používatelia"
 msgstr[2] "%s nájdených používateľov"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Neplatný hostiteľ"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Nemožno nájsť požadovanú funkciu"
 
@@ -421,7 +421,7 @@ msgstr "Vnorené skupiny"
 msgid ""
 "When switched on, groups that contain groups are supported. (Only works if "
 "the group member attribute contains DNs.)"
-msgstr ""
+msgstr "Ak je zapnuté, tak je možné používať skupiny, ktoré obsahujú iné skupiny. (Funguje, len ak atribút člena skupiny obsahuje DN.)"
 
 #: templates/settings.php:40
 msgid "Paging chunksize"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 8d398d85e7..ba071a1730 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -60,95 +60,95 @@ msgstr "Na voljo ni nobene začasne slike za profil. Poskusite znova."
 msgid "No crop data provided"
 msgstr "Ni podanih podatkov obreza"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "nedelja"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "ponedeljek"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "torek"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "sreda"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "četrtek"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "petek"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "sobota"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "januar"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "februar"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "marec"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "april"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "maj"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "junij"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "julij"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "avgust"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "september"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "oktober"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "november"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "december"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Poteka shranjevanje ..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "pred %n minuto"
@@ -156,7 +156,7 @@ msgstr[1] "pred %n minutama"
 msgstr[2] "pred %n minutami"
 msgstr[3] "pred %n minutami"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "pred %n uro"
@@ -164,15 +164,15 @@ msgstr[1] "pred %n urama"
 msgstr[2] "pred %n urami"
 msgstr[3] "pred %n urami"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "danes"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "včeraj"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "pred %n dnevom"
@@ -180,11 +180,11 @@ msgstr[1] "pred %n dnevoma"
 msgstr[2] "pred %n dnevi"
 msgstr[3] "pred %n dnevi"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "pred %n mesecem"
@@ -192,39 +192,39 @@ msgstr[1] "pred %n mesecema"
 msgstr[2] "pred %n meseci"
 msgstr[3] "pred %n meseci"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "lansko leto"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "let nazaj"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Izbor"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Napaka nalaganja predloge izbirnika datotek: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Izbor"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Napaka nalaganja predloge izbirnika datotek: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "V redu"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Napaka nalaganja predloge sporočil: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} spor datotek"
@@ -232,45 +232,45 @@ msgstr[1] "{count} spora datotek"
 msgstr[2] "{count} spori datotek"
 msgstr[3] "{count} sporov datotek"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "En spor datotek"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Nove datoteke"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Obstoječe datoteke"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Katare datoteke želite ohraniti?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Nadaljuj"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(vse izbrano)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} izbranih)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Napaka nalaganja predloge obstoječih datotek"
 
@@ -302,12 +302,12 @@ msgstr "V souporabi"
 msgid "Share"
 msgstr "Souporaba"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Napaka"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Napaka med souporabo"
 
@@ -335,107 +335,116 @@ msgstr "Souporaba z uporabnikom ali skupino ..."
 msgid "Share link"
 msgstr "Povezava za prejem"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Zaščiti z geslom"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Geslo"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Dovoli javno pošiljanje na strežnik"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Posreduj povezavo po elektronski pošti"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Pošlji"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Nastavi datum preteka"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Datum preteka"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Pošlji povezavo do dokumenta preko elektronske pošte:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Ni najdenih uporabnikov"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "skupina"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Nadaljnja souporaba ni dovoljena"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "V souporabi v {item} z uporabnikom {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Prekliči souporabo"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "obvesti po elektronski pošti"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "lahko ureja"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "nadzor dostopa"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "ustvari"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "posodobi"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "izbriše"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "določi souporabo"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Zaščiteno z geslom"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Napaka brisanja datuma preteka"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Napaka nastavljanja datuma preteka"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Pošiljanje ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Elektronska pošta je poslana"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Opozorilo"
 
@@ -679,6 +688,10 @@ msgstr "Za več informacij o pravilnem nastavljanju strežnika, kliknite na pove
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ustvari <strong>skrbniški račun</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Geslo"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Shramba in podatkovna zbirka"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index cc291cc794..2ddf4334a0 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -29,7 +29,7 @@ msgstr "Datoteke %s ni mogoče premakniti  - datoteka s tem imenom že obstaja."
 msgid "Could not move %s"
 msgstr "Datoteke %s ni mogoče premakniti"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Ime datoteke ne sme biti prazno polje."
 
@@ -38,18 +38,18 @@ msgstr "Ime datoteke ne sme biti prazno polje."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" je neveljavno ime datoteke."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Neveljavno ime; znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Ciljna mapa je premaknjena ali izbrisana."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -141,28 +141,32 @@ msgstr "Pošiljanje je spodletelo. Ni mogoče pridobiti podrobnosti datoteke."
 msgid "Invalid directory."
 msgstr "Neveljavna mapa."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Ni mogoče poslati datoteke {filename}, saj je to ali mapa ali pa je velikost datoteke 0 bajtov."
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Skupna velikost {size1} presega omejitev velikosti {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 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:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Pošiljanje je preklicano."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Ni mogoče pridobiti podatkov s strežnika."
 
@@ -175,55 +179,77 @@ msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošilja
 msgid "URL cannot be empty"
 msgstr "Polje naslova URL ne sme biti prazno"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} že obstaja"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Ni mogoče ustvariti datoteke"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Ni mogoče ustvariti mape"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Napaka pridobivanja naslova URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Souporaba"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Izbriši dokončno"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Napaka premikanja datoteke"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Napaka"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "V čakanju ..."
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Napaka premikanja datoteke."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Napaka premikanja datoteke"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Napaka"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Ni mogoče preimenovati datoteke"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Napaka brisanja datoteke."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Ime"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Velikost"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Spremenjeno"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mapa"
@@ -231,7 +257,7 @@ msgstr[1] "%n mapi"
 msgstr[2] "%n mape"
 msgstr[3] "%n map"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n datoteka"
@@ -239,11 +265,7 @@ msgstr[1] "%n datoteki"
 msgstr[2] "%n datoteke"
 msgstr[3] "%n datotek"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} in {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Posodabljanje %n datoteke"
@@ -251,61 +273,47 @@ msgstr[1] "Posodabljanje %n datotek"
 msgstr[2] "Posodabljanje %n datotek"
 msgstr[3] "Posodabljanje %n datotek"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" je neveljavno ime datoteke."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Prostor za shranjevanje je skoraj do konca zaseden ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite."
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Šifriranje je onemogočeno, datoteke pa so še vedno šifrirane. Odšifrirajte jih med nastavitvami."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} in {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Ime"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Velikost"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Spremenjeno"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s ni mogoče preimenovati"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Pošiljanje (omejitev %s)"
@@ -342,68 +350,75 @@ msgstr "Največja vhodna velikost za datoteke ZIP"
 msgid "Save"
 msgstr "Shrani"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Novo"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Nova besedilna datoteka"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Besedilna datoteka"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Mapa"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Iz povezave"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Izbrisane datoteke"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Prekliči pošiljanje"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Izbriši"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Prekoračenje omejitve velikosti"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Poteka preučevanje datotek, počakajte ..."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Trenutno poteka preučevanje"
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index f3e8a74c37..cb4cf2ea51 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-04-22 01:54-0400\n"
-"PO-Revision-Date: 2014-04-21 16:38+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -18,6 +18,166 @@ 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"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Krajevno"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Mesto"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Ključ"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Skrivni ključ"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr "Amazon S3 in podobno"
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "Ključ za dostop"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Skrivni ključ"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "Ime gostitelja (izbirno)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Vrata (izbirno)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Območje (izbirno)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Omogoči SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr "Omogoči slog poti"
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "Programski ključ"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr "Skrivni programski ključ"
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Gostitelj"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Uporabniško ime"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Geslo"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Koren"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "Varni način ftps://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "ID odjemalca"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr "Skrivni ključ odjemalca"
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Uporabniško ime (zahtevano)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Souporaba"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr "SMB / CIFS z uporabo prijave OC"
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr "Uporabniško ime za souporabo"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "Naslov URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "Varni način https://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "Oddaljena podrejena mapa"
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Dostop je odobren"
@@ -42,29 +202,29 @@ msgstr "Napaka nastavljanja shrambe Google Drive"
 msgid "Saved"
 msgstr "Shranjeno"
 
-#: lib/config.php:598
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Opomba:</b> "
 
-#: lib/config.php:608
+#: lib/config.php:599
 msgid " and "
 msgstr "in"
 
-#: lib/config.php:630
+#: lib/config.php:621
 #, 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 "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika."
 
-#: lib/config.php:632
+#: lib/config.php:623
 #, 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 "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika."
 
-#: lib/config.php:634
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index 151a1a65e5..110d71d901 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 19:30+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+0000\n"
 "Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Souporabo omogoča {owner}"
 
@@ -58,16 +58,15 @@ msgstr "souporaba je onemogočena."
 msgid "For more info, please ask the person who sent this link."
 msgstr "Za več podrobnosti stopite v stik s pošiljateljem te povezave."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "souporabp omogoča %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Prejmi"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Prejmi %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Neposredna povezava"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index a6351f684f..fc302d6b75 100644
--- a/l10n/sl/files_trashbin.po
+++ b/l10n/sl/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Datoteke %s ni mogoče trajno izbrisati."
 msgid "Couldn't restore %s"
 msgstr "Ni mogoče obnoviti %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Izbrisane datoteke"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Napaka"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Izbrisane datoteke"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "obnovljeno"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Mapa smeti je prazna."
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Ime"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Obnovi"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Napaka"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "obnovljeno"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Mapa smeti je prazna."
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Ime"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Izbrisano"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Izbriši"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 6e8ca0aa09..7e1ce4598e 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -19,12 +19,15 @@ 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"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -75,23 +78,23 @@ msgstr "Neveljavna slika"
 msgid "web services under your control"
 msgstr "spletne storitve pod vašim nadzorom"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Prejemanje datotek v paketu ZIP je onemogočeno."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Datoteke je mogoče prejeti le posamično."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Nazaj na datoteke"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -277,19 +280,19 @@ msgstr "Nastavi uporabniško ime skrbnika."
 msgid "Set an admin password."
 msgstr "Nastavi geslo skrbnika."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s je omogočil souporabo »%s«"
@@ -297,7 +300,7 @@ msgstr "%s je omogočil souporabo »%s«"
 #: private/share/share.php:498
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
+msgstr "Souporaba %s je spodletela, ker ta datoteka ne obstaja"
 
 #: private/share/share.php:523
 #, php-format
@@ -331,73 +334,79 @@ msgstr "Nastavljanje souporabe %s je spodletelo, ker je skupina %s ne obstaja."
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni član skupine %s."
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Nastavljanje souporabe %s je spodletelo, ker souporaba preko povezave ni dovoljena."
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Vrsta souporabe %s za %s ni veljavna."
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Ozadnjega programa %s za souporabo ni mogoče najti"
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Ozadnjega programa za souporabo za %s ni mogoče najti"
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Kategorije \"%s\" ni mogoče najti."
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 472cb4abbe..09832055c1 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Način pošiljanja"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Šifriranje"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Način overitve"
 
@@ -100,6 +100,16 @@ msgstr "Datotek ni mogoče odšifrirati. Preverite dnevnik owncloud.log ali pa s
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Datotek ni mogoče odšifrirati. Preverite geslo in poskusite znova."
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Elektronski naslov je shranjen"
@@ -116,6 +126,16 @@ msgstr "Skupine ni mogoče izbrisati"
 msgid "Unable to delete user"
 msgstr "Uporabnika ni mogoče izbrisati"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Jezik je spremenjen"
@@ -171,7 +191,7 @@ msgstr "Hrbtišče programa ne podpira spreminjanja gesla, je pa uspešno posodo
 msgid "Unable to change password"
 msgstr "Ni mogoče spremeniti gesla"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Poteka pošiljanje ..."
 
@@ -227,34 +247,42 @@ msgstr "Posodobi"
 msgid "Updated"
 msgstr "Posodobljeno"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Izbor slike profila"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Zelo šibko geslo"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Šibko geslo"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Slabo geslo"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Dobro geslo"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Odlično geslo"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "izbrisano"
@@ -300,7 +328,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Slovenščina"
 
@@ -488,148 +516,143 @@ msgstr "Dovoli programom uporabo vmesnika API souporabe"
 msgid "Allow links"
 msgstr "Dovoli povezave"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Dovoli javno pošiljanje datotek v oblak"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Dovoli nadaljnjo souporabo"
-
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
-msgstr "Uporabnikom dovoli nadaljnjo souporabo predmetov"
-
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
-msgstr "Uporabnikom dovoli souporabo s komerkoli"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Dovoli obvestila preko elektronske pošte"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti."
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Uporabnikom dovoli souporabo predmetov z javnimi povezavami"
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Dovoli nadaljnjo souporabo"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Uporabnikom dovoli nadaljnjo souporabo predmetov"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Uporabnikom dovoli souporabo s komerkoli"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "Uporabnikom dovoli souporabo z ostalimi uporabniki njihove skupine"
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr "Dovoli obvestila preko elektronske pošte"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti."
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Varnost"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Zahtevaj uporabo HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "Poštni strežnik"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Zahtevana je overitev"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Naslov strežnika"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Vrata"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Poverila"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "Uporabniško ime SMTP"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "Geslo SMTP"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Preizkus nastavitev elektronske pošte"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Pošlji elektronsko sporočilo"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Dnevnik"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Raven beleženja"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Več"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Manj"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Različica"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -782,29 +805,33 @@ msgstr "Jezik"
 msgid "Help translate"
 msgstr "Sodelujte pri prevajanju"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Prijavno geslo"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Odšifriraj vse datoteke"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Prijavno ime"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index e74f46f26b..2734f58abb 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -88,47 +88,47 @@ msgstr "Uspešno končano."
 msgid "Error"
 msgstr "Napaka"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Nastavitev je ustrezna"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Nastavitev ni ustrezna"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Nastavitev je nepopolna"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Izberi skupine"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Izbor razredov predmeta"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Izbor atributov"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Preizkus povezave je uspešno končan."
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Preizkus povezave je spodletel."
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Ali res želite izbrisati trenutne nastavitve strežnika?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Potrdi brisanje"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -137,7 +137,7 @@ msgstr[1] "%s najdeni skupini"
 msgstr[2] "%s najdene skupine"
 msgstr[3] "%s najdenih skupin"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -146,11 +146,11 @@ msgstr[1] "%s najdena uporabnika"
 msgstr[2] "%s najdeni uporabniki"
 msgstr[3] "%s najdenih uporabnikov"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Neveljaven gostitelj"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Želene zmožnosti ni mogoče najti"
 
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 170478f66a..dae20a3b74 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -60,207 +60,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "E djelë"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "E hënë"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "E martë"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "E mërkurë"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "E enjte"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "E premte"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "E shtunë"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Janar"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Shkurt"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Prill"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Qershor"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Korrik"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Gusht"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Shtator"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Tetor"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Nëntor"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Dhjetor"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Parametra"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Duke ruajtur..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "sekonda më parë"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minut më parë"
 msgstr[1] "%n minuta më parë"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n orë më parë"
 msgstr[1] "%n orë më parë"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "sot"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "dje"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n ditë më parë"
 msgstr[1] "%n ditë më parë"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "muajin e shkuar"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n muaj më parë"
 msgstr[1] "%n muaj më parë"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "vitin e shkuar"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "vite më parë"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Zgjidh"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Po"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Jo"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Zgjidh"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Në rregull"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Anulo"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -292,12 +292,12 @@ msgstr "Ndarë"
 msgid "Share"
 msgstr "Nda"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Veprim i gabuar"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Veprim i gabuar gjatë ndarjes"
 
@@ -325,107 +325,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Mbro me kod"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Kodi"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Lejo Ngarkimin Publik"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Dërgo email me lidhjen"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Dërgo"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Cakto datën e përfundimit"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Data e përfundimit"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Nda me email:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Nuk u gjet asnjë person"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grupi"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Rindarja nuk lejohet"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Ndarë në {item} me {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Hiq ndarjen"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "mund të ndryshosh"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "kontrollimi i hyrjeve"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "krijo"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "azhurno"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "elimino"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "nda"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Mbrojtur me kod"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Veprim i gabuar gjatë heqjes së datës së përfundimit"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Veprim i gabuar gjatë caktimit të datës së përfundimit"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Duke dërguar..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Email-i u dërgua"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -669,6 +678,10 @@ msgstr "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj,
 msgid "Create an <strong>admin account</strong>"
 msgstr "Krijo një <strong>llogari administruesi</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Kodi"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index b3d42df532..36be6050e3 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -29,7 +29,7 @@ msgstr "E pa mundur zhvendosja e %s - ekziston nje skedar me te njetin emer"
 msgid "Could not move %s"
 msgstr "Nuk mund të zhvendoset %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Emri i skedarit nuk mund të jetë bosh."
 
@@ -38,18 +38,18 @@ msgstr "Emri i skedarit nuk mund të jetë bosh."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Emër jo i vlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -141,28 +141,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr "Dosje e pavlefshme"
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Skedarë"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Ngarkimi u anullua"
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -175,131 +179,135 @@ msgstr "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin"
 msgid "URL cannot be empty"
 msgstr "URL-i nuk mund të jetë bosh"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} është ekzistues "
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "I pamundur krijimi i kartelës"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Ndaj"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Fshi përfundimisht"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Riemëro"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Gabim lëvizjen dokumentave"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Gabim"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Në vijim"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Gabim lëvizjen dokumentave"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Gabim"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Emri"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Madhësia"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Ndryshuar"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dosje"
 msgstr[1] "%n dosje"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n skedar"
 msgstr[1] "%n skedarë"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} dhe {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Po ngarkoj %n skedar"
 msgstr[1] "Po ngarkoj %n skedarë"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Hapsira juaj e arkivimit është plot, skedarët nuk mund të përditësohen ose sinkronizohen!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Hapsira juaj e arkivimit është pothuajse në fund  ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} dhe {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Emri"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Madhësia"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Ndryshuar"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "Nuk është i mundur riemërtimi i %s"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -336,68 +344,75 @@ msgstr "Maksimumi hyrës i skedarëve ZIP"
 msgid "Save"
 msgstr "Ruaj"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "E re"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Skedar tekst"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Dosje e're"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Dosje"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Nga lidhja"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Skedarë të fshirë "
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Anullo ngarkimin"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Këtu nuk ka asgje. Ngarko dicka"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Shkarko"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Fshi"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Ngarkimi shumë i madh"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Skanerizimi i skedarit në proces. Ju lutem prisni."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Skanimi aktual"
diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po
index 27f4c28f01..10b43f23f7 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -17,6 +17,166 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Vendndodhja"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Pritësi"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Përdoruesi"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "fjalëkalim"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Ndaj"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL-i"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index 492388cd80..e98c2b091c 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.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-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +19,7 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -59,16 +59,15 @@ msgstr "ndarja është çaktivizuar"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr ""
+#: templates/public.php:21
+msgid "Download"
+msgstr "Shkarko"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Lidhje direkte"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index 7ec3e575dc..71696ba0ad 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Nuk munda ta eliminoj përfundimisht %s"
 msgid "Couldn't restore %s"
 msgstr "Nuk munda ta rivendos %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Skedarë të fshirë "
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Veprim i gabuar"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Skedarë të eliminuar"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "rivendosur"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Këtu nuk ka asgjë. Koshi juaj është bosh!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Emri"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Rivendos"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Veprim i gabuar"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "rivendosur"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Këtu nuk ka asgjë. Koshi juaj është bosh!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Emri"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Eliminuar"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Elimino"
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 29db7acc77..932b90db8a 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -17,12 +17,15 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "shërbime web nën kontrollin tënd"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Shkarimi i skedarëve ZIP është i çaktivizuar."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Skedarët duhet të shkarkohen një nga një."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Kthehu tek skedarët"
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr "Cakto emrin e administratorit."
 msgid "Set an admin password."
 msgstr "Cakto kodin e administratorit."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s ndau »%s« me ju"
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Kategoria \"%s\" nuk u gjet"
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 8f0f7655d1..fe5bd6aad1 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Email u ruajt"
@@ -114,6 +124,16 @@ msgstr "E pamundur të fshihet grupi"
 msgid "Unable to delete user"
 msgstr "E pamundur të fshihet përdoruesi"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Gjuha u ndryshua"
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr "Përditësim"
 msgid "Updated"
 msgstr "I përditësuar"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "fshirë"
@@ -298,7 +326,7 @@ msgstr "Duhet të jepni një fjalëkalim te vlefshëm"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Shqip"
 
@@ -486,148 +514,143 @@ msgstr "Lejoni aplikacionet të përdorin share API"
 msgid "Allow links"
 msgstr "Lejo lidhjet"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Lejo ngarkimin publik"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Lejo ri-ndarjen"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Lejo përdoruesit të ndajnë me cilindo"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+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:252
+msgid "Allow resharing"
+msgstr "Lejo ri-ndarjen"
+
+#: templates/admin.php:253
+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:260
+msgid "Allow users to share with anyone"
+msgstr "Lejo përdoruesit të ndajnë me cilindo"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Siguria"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Detyro HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Porta"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Historik aktiviteti"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Niveli i Historikut"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Më tepër"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "M'pak"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Versioni"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr "Gjuha"
 msgid "Help translate"
 msgstr "Ndihmoni në përkthim"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Emri i Përdoruesit"
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index f3865d2c2e..112fb1996b 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -86,65 +86,65 @@ msgstr "Sukses"
 msgid "Error"
 msgstr "Gabim"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Prova e lidhjes përfundoi me sukses"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Prova e lidhjes dështoi"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Jeni vërtetë të sigurt të fshini konfigurimet aktuale të serverit?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Konfirmoni Fshirjen"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 09d3613ff3..ac17e95427 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,212 +58,212 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Недеља"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Понедељак"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Уторак"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Среда"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Четвртак"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Петак"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Субота"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Јануар"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Фебруар"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Март"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Април"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Мај"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Јун"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Јул"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Август"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Септембар"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Октобар"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Новембар"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Децембар"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Поставке"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Чување у току..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "пре неколико секунди"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "данас"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "јуче"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "прошлог месеца"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "прошле године"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "година раније"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Одабери"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Да"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Не"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Одабери"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "У реду"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Откажи"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -295,12 +295,12 @@ msgstr ""
 msgid "Share"
 msgstr "Дели"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Грешка"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Грешка у дељењу"
 
@@ -328,107 +328,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Заштићено лозинком"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Лозинка"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Пошаљи"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Постави датум истека"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Датум истека"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Подели поштом:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Особе нису пронађене."
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "група"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Поновно дељење није дозвољено"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Подељено унутар {item} са {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Укини дељење"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "може да мења"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "права приступа"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "направи"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "ажурирај"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "обриши"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "подели"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Заштићено лозинком"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Грешка код поништавања датума истека"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Грешка код постављања датума истека"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Шаљем..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Порука је послата"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Упозорење"
 
@@ -672,6 +681,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Направи <strong>административни налог</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Лозинка"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 2ece07bd1c..84cb5af81d 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -27,7 +27,7 @@ msgstr "Не могу да преместим %s – датотека с ови
 msgid "Could not move %s"
 msgstr "Не могу да преместим %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Име датотеке не може бити празно."
 
@@ -36,18 +36,18 @@ msgstr "Име датотеке не може бити празно."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr "неисправна фасцикла."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Датотеке"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Отпремање је прекинуто."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,134 +177,138 @@ msgstr "Отпремање датотеке је у току. Ако сада н
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} већ постоји"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Дели"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Обриши за стално"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Преименуј"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr ""
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Припремам преузимање. Ово може да потраје ако су датотеке велике."
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Грешка"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "На чекању"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Грешка"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Име"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Величина"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Измењено"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Ваше складиште је пуно. Датотеке више не могу бити ажуриране ни синхронизоване."
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше складиште је скоро па пуно ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
-msgstr "Припремам преузимање. Ово може да потраје ако су датотеке велике."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Име"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Величина"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Измењено"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -337,68 +345,75 @@ msgstr "Највећа величина ZIP датотека"
 msgid "Save"
 msgstr "Сачувај"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Нова"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "текстуална датотека"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "фасцикла"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Са везе"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Обрисане датотеке"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Прекини отпремање"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Овде нема ничег. Отпремите нешто!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Обриши"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Датотека је превелика"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеке које желите да отпремите прелазе ограничење у величини."
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Скенирам датотеке…"
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Тренутно скенирање"
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index ac5a5f2331..d2bde275c7 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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,6 +17,166 @@ 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"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Локација"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Домаћин"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Корисничко име"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Лозинка"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Дели"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 8a40c7c4bb..d303fcfb81 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Преузми"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index d105f0abc3..7d52a42706 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "Име"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Врати"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Грешка"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Овде нема ништа. Корпа за отпатке је празна."
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Име"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Обрисано"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Обриши"
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 49b85c5410..20f91d1eeb 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ 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"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "веб сервиси под контролом"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Преузимање ZIP-а је искључено."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Датотеке морате преузимати једну по једну."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Назад на датотеке"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Изабране датотеке су превелике да бисте направили ZIP датотеку."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Погледајте <a href='%s'>водиче за инсталацију</a>."
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Не могу да пронађем категорију „%s“."
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index df050052ef..43b6f657a9 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Шифровање"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Е-порука сачувана"
@@ -114,6 +124,16 @@ msgstr "Не могу да уклоним групу"
 msgid "Unable to delete user"
 msgstr "Не могу да уклоним корисника"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Језик је промењен"
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr "Ажурирај"
 msgid "Updated"
 msgstr "Ажурирано"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "обрисано"
@@ -298,7 +326,7 @@ msgstr "Морате унети исправну лозинку"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -486,148 +514,143 @@ msgstr "Дозвољава апликацијама да користе API Shar
 msgid "Allow links"
 msgstr "Дозволи везе"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Дозволи корисницима да деле ставке с другима путем веза"
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Дозволи корисницима да деле ставке с другима путем веза"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Дозволи поновно дељење"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Дозволи корисницима да поновно деле ставке с другима"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Дозволи корисницима да деле са било ким"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "Дозволи корисницима да деле само са корисницима у њиховим групама"
+
 #: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Безбедност"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Наметни HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Адреса сервера"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Порт"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Бележење"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Ниво бележења"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Више"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Мање"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr "Језик"
 msgid "Help translate"
 msgstr " Помозите у превођењу"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Корисничко име"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index d713be3271..667ef9b99f 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -86,47 +86,47 @@ msgstr ""
 msgid "Error"
 msgstr "Грешка"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -134,7 +134,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -142,11 +142,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index b4e75d7309..1607e61416 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -60,212 +60,212 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Nedelja"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Ponedeljak"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Sreda"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Četvrtak"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Petak"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Subota"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Mart"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "April"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Jun"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Jul"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Avgust"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Septembar"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktobar"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Novembar"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Decembar"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "Pre par sekundi"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "Danas"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "juče"
 
-#: js/js.js:1251
+#: js/js.js:1245
 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:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "prošlog meseca"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "prošle godine"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "pre nekoliko godina"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Izaberi"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Izaberi"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -297,12 +297,12 @@ msgstr "Deljeno"
 msgid "Share"
 msgstr "Podeli"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Greška"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Greška pri deljenju"
 
@@ -330,107 +330,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Zaštita lozinkom"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Lozinka"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Pošalji link e-mailom"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Pošalji"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Datum isteka"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Datum isteka"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Deli putem e-maila"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Nema pronađenih ljudi"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Dalje deljenje nije dozvoljeno"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Deljeno u {item} sa {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Ukljoni deljenje"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "dozvoljene izmene"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "kontrola pristupa"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "napravi"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "ažuriranje"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "brisanje"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "deljenje"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Zaštćeno lozinkom"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Greška u uklanjanju datuma isteka"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Greška u postavljanju datuma isteka"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Slanje..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Email poslat"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -674,6 +683,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Napravi <strong>administrativni nalog</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Lozinka"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index b2c300486f..a5ad2bd2c5 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Fajlovi"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,134 +177,138 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Podeli"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Preimenij"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Greška"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Greška"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Ime"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Veličina"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Zadnja izmena"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Ime"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Veličina"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Zadnja izmena"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -337,68 +345,75 @@ msgstr ""
 msgid "Save"
 msgstr "Snimi"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Ovde nema ničeg. Pošaljite nešto!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Pošiljka je prevelika"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index 036e65f4a2..fd8040a72b 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ 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"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Lokacija"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Korisničko ime"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Lozinka"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Podeli"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 41dbd79a9a..93da175ced 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "Preuzmi"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index 0098ac3a75..17b9afaf50 100644
--- a/l10n/sr@latin/files_trashbin.po
+++ b/l10n/sr@latin/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Greška"
-
-#: 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 "Ime"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Greška"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Ime"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Obriši"
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index 65c7d8036d..a70d1e6b77 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ 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"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index c0c907fcf6..7acef0aaf7 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Jezik je izmenjen"
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr "Jezik"
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 0cde3d5680..0c22027a8e 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Greška"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -146,7 +146,7 @@ msgstr[2] ""
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:984
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/su/core.po b/l10n/su/core.po
index ae84b0e517..39a9fe37d5 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,202 +58,202 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -285,12 +285,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -318,107 +318,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -662,6 +671,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/su/files.po b/l10n/su/files.po
index e8e5da24f7..d47430439b 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,128 +177,132 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -331,68 +339,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/su/files_external.po b/l10n/su/files_external.po
index 206f00c67e..9420146325 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: su\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/su/files_sharing.po b/l10n/su/files_sharing.po
index 868f619bef..35479e18ff 100644
--- a/l10n/su/files_sharing.po
+++ b/l10n/su/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: su\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/su/files_trashbin.po b/l10n/su/files_trashbin.po
index a2c4e0bb72..b0691a0c20 100644
--- a/l10n/su/files_trashbin.po
+++ b/l10n/su/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/su/lib.po b/l10n/su/lib.po
index 4a16c9c911..ed1099bc7c 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: su\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/su/settings.po b/l10n/su/settings.po
index b33b3f2489..93cbabe5bc 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index e83bb24047..0b7d48bea6 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -8,7 +8,7 @@
 # enoch85 <enoch85@gmail.com>, 2014
 # Gunnar Norin <blittan@xbmc.org>, 2013
 # Gustav Smedberg <shadow.elf@hotmail.com>, 2013
-# medialabs, 2013
+# medialabs, 2013-2014
 # kallemooo <karl.h.thoren@gmail.com>, 2013
 # Magnus Höglund <magnus@linux.com>, 2013
 # medialabs, 2013
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 13:01+0000\n"
-"Last-Translator: enoch85 <enoch85@gmail.com>\n"
+"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"PO-Revision-Date: 2014-05-18 21:01+0000\n"
+"Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,79 +67,79 @@ msgstr "Ingen temporär profilbild finns tillgänglig, försök igen"
 msgid "No crop data provided"
 msgstr "Ingen beskärdata har angivits"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Söndag"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Måndag"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Tisdag"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Lördag"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Januari"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februari"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "April"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Augusti"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "December"
 
@@ -199,75 +199,75 @@ msgstr "förra året"
 msgid "years ago"
 msgstr "år sedan"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Välj"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Fel uppstod för filväljarmall: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nej"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Välj"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Fel uppstod för filväljarmall: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Fel uppstod under inläsningen av meddelandemallen: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} filkonflikt"
 msgstr[1] "{count} filkonflikter"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "En filkonflikt"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Nya filer"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Filer som redan existerar"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Vilken fil vill du behålla?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Fortsätt"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(Alla valda)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} valda)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Fel uppstod filmall existerar"
 
@@ -299,12 +299,12 @@ msgstr "Delad"
 msgid "Share"
 msgstr "Dela"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Fel"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Fel vid delning"
 
@@ -332,107 +332,116 @@ msgstr "Dela med användare eller grupp..."
 msgid "Share link"
 msgstr "Dela länk"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades"
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr "Som standard kommer den publika länken att sluta gälla efter {days} dagar"
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Lösenordsskydda"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Lösenord"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr "Välj ett lösenord för den publika länken"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Tillåt publik uppladdning"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "E-posta länk till person"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Skicka"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Sätt utgångsdatum"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Utgångsdatum"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Dela via e-post:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Hittar inga användare"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "Grupp"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Dela vidare är inte tillåtet"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Delad i {item} med {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Sluta dela"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "informera via e-post"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "kan redigera"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "åtkomstkontroll"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "skapa"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "uppdatera"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "radera"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "dela"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Lösenordsskyddad"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Fel vid borttagning av utgångsdatum"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Fel vid sättning av utgångsdatum"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Skickar ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "E-post skickat"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Varning"
 
@@ -676,6 +685,10 @@ msgstr "För information hur du korrekt konfigurerar din servern, se ownCloud <a
 msgid "Create an <strong>admin account</strong>"
 msgstr "Skapa ett <strong>administratörskonto</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Lösenord"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Lagring & databas"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 83fada0113..b945d126e5 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -9,7 +9,7 @@
 # enoch85 <enoch85@gmail.com>, 2014
 # Gunnar Norin <blittan@xbmc.org>, 2013
 # Gustav Smedberg <shadow.elf@hotmail.com>, 2013
-# medialabs, 2013
+# medialabs, 2013-2014
 # kallemooo <karl.h.thoren@gmail.com>, 2013
 # Magnus Höglund <magnus@linux.com>, 2013
 # medialabs, 2013
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"PO-Revision-Date: 2014-05-18 21:21+0000\n"
+"Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +37,7 @@ msgstr "Kunde inte flytta %s - Det finns redan en fil med detta namn"
 msgid "Could not move %s"
 msgstr "Kan inte flytta %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Filnamn kan inte vara tomt."
 
@@ -46,18 +46,18 @@ msgstr "Filnamn kan inte vara tomt."
 msgid "\"%s\" is an invalid file name."
 msgstr "\"%s\" är ett ogiltigt filnamn."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Målmappen har flyttats eller tagits bort."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -149,28 +149,32 @@ msgstr "Uppladdning misslyckades. Gick inte att hämta filinformation."
 msgid "Invalid directory."
 msgstr "Felaktig mapp."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Filer"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Alla filer"
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes."
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Totala filstorleken {size1} överskrider uppladdningsgränsen {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr "Inte tillräckligt med ledigt utrymme, du laddar upp {size1} men endast {size2} finns kvar."
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Uppladdning avbruten."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Gick inte att hämta resultat från server."
 
@@ -183,131 +187,135 @@ msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
 msgid "URL cannot be empty"
 msgstr "URL kan ej vara tomt"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} finns redan"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Kunde ej skapa fil"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Kunde ej skapa katalog"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Fel vid hämtning av URL"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Dela"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Radera permanent"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Byt namn"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Fel uppstod vid flyttning av fil"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Fel"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Väntar"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Fel vid flytt av fil."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Fel uppstod vid flyttning av fil"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Fel"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Kan ej byta filnamn"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Kunde inte ta bort filen."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Namn"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Storlek"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Ändrad"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mapp"
 msgstr[1] "%n mappar"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
 msgstr[1] "%n filer"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} och {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Laddar upp %n fil"
 msgstr[1] "Laddar upp %n filer"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" är ett ogiltligt filnamn."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och  in igen"
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Ogiltig privat nyckel i krypteringsprogrammet. Vänligen uppdatera lösenordet till din privata nyckel under dina personliga inställningar för att återfå tillgång till dina krypterade filer."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} och {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Namn"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Storlek"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Ändrad"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s kunde inte namnändras"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Ladda upp (max. %s)"
@@ -344,68 +352,75 @@ msgstr "Största tillåtna storlek för ZIP-filer"
 msgid "Save"
 msgstr "Spara"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Ny textfil"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Textfil"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Mapp"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Från länk"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Raderade filer"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Avbryt uppladdning"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting här. Ladda upp något!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Radera"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "För stor uppladdning"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Filer skannas, var god vänta"
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Aktuell skanning"
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index b7858c13ef..065343a1b2 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -6,14 +6,15 @@
 # AsavarTzeth <asavartzeth@gmail.com>, 2014
 # enoch85 <enoch85@gmail.com>, 2014
 # henrikhjelm <mailto@henrikhjelm.se>, 2014
+# medialabs, 2014
 # medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 12:53+0000\n"
-"Last-Translator: enoch85 <enoch85@gmail.com>\n"
+"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"PO-Revision-Date: 2014-05-18 21:11+0000\n"
+"Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,6 +22,166 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Lokal"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Plats"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Nyckel"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Hemlig"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "Aktivera SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Server"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Användarnamn"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Lösenord"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Root"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "Säker ftps://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Dela"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "Säker https://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Åtkomst beviljad"
@@ -45,29 +206,29 @@ msgstr "Fel vid konfigurering av Google Drive"
 msgid "Saved"
 msgstr "Sparad"
 
-#: lib/config.php:598
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b> OBS: </ b>"
 
-#: lib/config.php:608
+#: lib/config.php:599
 msgid " and "
 msgstr "och"
 
-#: lib/config.php:630
+#: lib/config.php:621
 #, 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 "<b> OBS: </ b> cURL stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör att installera det."
 
-#: lib/config.php:632
+#: lib/config.php:623
 #, 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 "<b> OBS: </ b> Den FTP-stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör att installera det."
 
-#: lib/config.php:634
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 003e9595bd..68ab886542 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/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-04-07 01:55-0400\n"
-"PO-Revision-Date: 2014-04-06 10:50+0000\n"
-"Last-Translator: AsavarTzeth <asavartzeth@gmail.com>\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,16 +61,15 @@ msgstr "delning är inaktiverat"
 msgid "For more info, please ask the person who sent this link."
 msgstr "För mer information, kontakta den person som skickade den här länken."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "delad av %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Ladda ner"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "Ladda ner %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Direkt länk"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index b27247db1f..8c8e1cd82d 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 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"
@@ -29,38 +29,34 @@ msgstr "Kunde inte radera %s permanent"
 msgid "Couldn't restore %s"
 msgstr "Kunde inte återställa %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Raderade filer"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Fel"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Raderade filer"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "återställd"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Ingenting här. Din papperskorg är tom!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Namn"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Återskapa"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Fel"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "återställd"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Ingenting här. Din papperskorg är tom!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Namn"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Raderad"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Radera"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 4612c74c01..4e17bd8d41 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -7,7 +7,7 @@
 # Daniel Sandman <revoltism@gmail.com>, 2013
 # enoch85 <enoch85@gmail.com>, 2014
 # henrikhjelm <mailto@henrikhjelm.se>, 2014
-# medialabs, 2013
+# medialabs, 2013-2014
 # kallemooo <karl.h.thoren@gmail.com>, 2013
 # Magnus Höglund <magnus@linux.com>, 2013
 # medialabs, 2013
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"PO-Revision-Date: 2014-05-18 21:21+0000\n"
+"Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +25,15 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
-msgstr ""
+msgstr "Du ansluter till servern från en osäker domän."
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -81,23 +84,23 @@ msgstr "Ogiltig bild"
 msgid "web services under your control"
 msgstr "webbtjänster under din kontroll"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Nerladdning av ZIP är avstängd."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Filer laddas ner en åt gången."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Tillbaka till Filer"
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -283,19 +286,19 @@ msgstr "Ange ett användarnamn för administratören."
 msgid "Set an admin password."
 msgstr "Ange ett administratörslösenord."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s delade »%s« med dig"
@@ -303,7 +306,7 @@ msgstr "%s delade »%s« med dig"
 #: private/share/share.php:498
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
+msgstr "Delning av %s misslyckades på grund av att filen inte existerar"
 
 #: private/share/share.php:523
 #, php-format
@@ -337,73 +340,79 @@ msgstr "Delning %s misslyckades därför att gruppen %s inte existerar"
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Delning %s misslyckades därför att %s inte ingår i gruppen %s"
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Delning %s misslyckades därför att delning utav länkar inte är tillåtet"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Delningstyp %s är inte giltig för %s"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Misslyckades att sätta rättigheter för %s därför att rättigheterna överskrider de som är tillåtna för %s"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Att sätta rättigheterna för %s misslyckades därför att objektet inte hittades"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Delningsgränssnittet %s måste implementera gränssnittet OCP\\Share_Backend"
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Delningsgränssnittet %s hittades inte"
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Delningsgränssnittet för %s hittades inte"
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Delning %s misslyckades därför att användaren %s är den som delade objektet först"
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Delning %s misslyckades därför att rättigheterna överskrider de rättigheter som är tillåtna för %s"
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Delning %s misslyckades därför att vidaredelning inte är tillåten"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Delning %s misslyckades därför att delningsgränsnittet för %s inte kunde hitta sin källa"
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr "Delning %s misslyckades därför att filen inte kunde hittas i filcachen"
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Kunde inte hitta kategorin \"%s\""
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 92217eae0d..fe7a9981a3 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -11,7 +11,7 @@
 # henrikhjelm <mailto@henrikhjelm.se>, 2014
 # Jan Busk, 2013
 # Jan Busk, 2013
-# medialabs, 2013
+# medialabs, 2013-2014
 # kallemooo <karl.h.thoren@gmail.com>, 2013
 # Magnus Höglund <magnus@linux.com>, 2013
 # medialabs, 2013
@@ -20,9 +20,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"PO-Revision-Date: 2014-05-18 21:11+0000\n"
+"Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,15 +60,15 @@ msgstr "E-post skickat"
 msgid "You need to set your user email before being able to send test emails."
 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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Sändningsläge"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
@@ -111,6 +111,16 @@ msgstr "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log el
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen"
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Krypteringsnycklar raderades permanent"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "E-post sparad"
@@ -127,6 +137,16 @@ msgstr "Kan inte radera grupp"
 msgid "Unable to delete user"
 msgstr "Kan inte radera användare"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Återställning av säkerhetskopior lyckades"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Språk ändrades"
@@ -182,7 +202,7 @@ msgstr "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteri
 msgid "Unable to change password"
 msgstr "Kunde inte ändra lösenord"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Skickar..."
 
@@ -238,34 +258,42 @@ msgstr "Uppdatera"
 msgid "Updated"
 msgstr "Uppdaterad"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Välj en profilbild"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Väldigt svagt lösenord"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Svagt lösenord"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Okej lösenord"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Bra lösenord"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Starkt lösenord"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dekrypterar filer... Vänligen vänta, detta kan ta en stund."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Radera krypteringsnycklar permanent"
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Återställ krypteringsnycklar"
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "raderad"
@@ -311,7 +339,7 @@ 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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -499,148 +527,143 @@ msgstr "Tillåt applikationer att använda delat API"
 msgid "Allow links"
 msgstr "Tillåt länkar"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Tillåt offentlig uppladdning"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Tillåt vidaredelning"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Tillåt delning med alla"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Tillåt e-post notifikation"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Tillåt användare att skicka mailnotifieringar för delade filer"
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr "Förfaller efter"
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr "dagar"
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Låt delningar förfalla som standard efter N dagar"
+#: templates/admin.php:242
+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:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Tillåt vidaredelning"
+
+#: templates/admin.php:253
+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:260
+msgid "Allow users to share with anyone"
+msgstr "Tillåt delning med alla"
+
+#: templates/admin.php:263
+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:270
+msgid "Allow mail notification"
+msgstr "Tillåt e-post notifikation"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr "Tillåt användare att skicka mailnotifieringar för delade filer"
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Säkerhet"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Kräv HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, 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:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "E-postserver"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Detta används för att skicka ut notifieringar."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Från adress"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Autentisering krävs"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Serveradress"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Inloggningsuppgifter"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "SMTP användarnamn"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "SMTP lösenord"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "Testa e-post inställninggar"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "Skicka e-post"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Nivå på loggning"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -793,29 +816,33 @@ msgstr "Språk"
 msgid "Help translate"
 msgstr "Hjälp att översätta"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer"
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Inloggningslösenord"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Dekryptera alla filer"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Återställ krypteringsnycklar"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Radera krypteringsnycklar"
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Inloggningsnamn"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 4161dc8681..c02f16f381 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
 "Last-Translator: henrikhjelm <mailto@henrikhjelm.se>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -96,65 +96,65 @@ msgstr "Lyckat"
 msgid "Error"
 msgstr "Fel"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfigurationen är OK"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Felaktig konfiguration"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Konfigurationen är ej komplett"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Välj grupper"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Välj Objekt-klasser"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Välj attribut"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Anslutningstestet lyckades"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Anslutningstestet misslyckades"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Vill du verkligen radera den nuvarande serverinställningen?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Bekräfta radering"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s grupp hittad"
 msgstr[1] "%s grupper hittade"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s användare hittad"
 msgstr[1] "%s användare hittade"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Felaktig Host"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "Det gick inte hitta den önskade funktionen"
 
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 61d4b11f7e..76b089e98d 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index c8f351f5dc..2b3401fae3 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/sw_KE/files_external.po b/l10n/sw_KE/files_external.po
index aa643c7a40..c9a028aedc 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sw_KE/files_sharing.po b/l10n/sw_KE/files_sharing.po
index 768ae9c285..51beb82fc7 100644
--- a/l10n/sw_KE/files_sharing.po
+++ b/l10n/sw_KE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/sw_KE/files_trashbin.po b/l10n/sw_KE/files_trashbin.po
index 3dd0ee0259..7142c39ecd 100644
--- a/l10n/sw_KE/files_trashbin.po
+++ b/l10n/sw_KE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index 0e5edf6897..895b0f75c0 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index 9ab7ca5f0a..735b215f87 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ta_IN/core.po b/l10n/ta_IN/core.po
new file mode 100644
index 0000000000..08ad02987c
--- /dev/null
+++ b/l10n/ta_IN/core.po
@@ -0,0 +1,818 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_IN\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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:483
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:583
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1240
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1241
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1242
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1243
+msgid "today"
+msgstr ""
+
+#: js/js.js:1244
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1245
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1246
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1247
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1248
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1249
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+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:761
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:160 js/share.js:824
+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:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:289
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:292
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:336 js/share.js:397
+msgid "group"
+msgstr ""
+
+#: js/share.js:369
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:413
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:435
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:443
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:446
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:448
+msgid "access control"
+msgstr ""
+
+#: js/share.js:451
+msgid "create"
+msgstr ""
+
+#: js/share.js:454
+msgid "update"
+msgstr ""
+
+#: js/share.js:457
+msgid "delete"
+msgstr ""
+
+#: js/share.js:460
+msgid "share"
+msgstr ""
+
+#: js/share.js:742
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:761
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:782
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:811
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:822
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:846
+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:264
+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:60 templates/login.php:40
+msgid "Password"
+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/ta_IN/files.po b/l10n/ta_IN/files.po
new file mode 100644
index 0000000000..eac9b7e8de
--- /dev/null
+++ b/l10n/ta_IN/files.po
@@ -0,0 +1,416 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_IN\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:103
+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:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, 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:169
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:179
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:194
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1672
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1335
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1580 js/filelist.js:1619
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+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:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+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/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/ta_IN/files_encryption.po b/l10n/ta_IN/files_encryption.po
new file mode 100644
index 0000000000..df89e0a6f4
--- /dev/null
+++ b/l10n/ta_IN/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-05-01 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_IN\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/ta_IN/files_external.po b/l10n/ta_IN/files_external.po
new file mode 100644
index 0000000000..168867f5ca
--- /dev/null
+++ b/l10n/ta_IN/files_external.po
@@ -0,0 +1,296 @@
+# 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-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: 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:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, 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:623
+#, 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:625
+#, 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/ta_IN/files_sharing.po b/l10n/ta_IN/files_sharing.po
new file mode 100644
index 0000000000..84a5934cd2
--- /dev/null
+++ b/l10n/ta_IN/files_sharing.po
@@ -0,0 +1,71 @@
+# 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-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_IN\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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:53
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:57
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/ta_IN/files_trashbin.po b/l10n/ta_IN/files_trashbin.po
new file mode 100644
index 0000000000..0c95a17b30
--- /dev/null
+++ b/l10n/ta_IN/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_IN\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 ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ta_IN/files_versions.po b/l10n/ta_IN/files_versions.po
new file mode 100644
index 0000000000..e5a9249e0d
--- /dev/null
+++ b/l10n/ta_IN/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-05-01 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_IN\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/ta_IN/lib.po b/l10n/ta_IN/lib.po
new file mode 100644
index 0000000000..60cfdbd2a1
--- /dev/null
+++ b/l10n/ta_IN/lib.po
@@ -0,0 +1,476 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:685
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: 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:880
+#, 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:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+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:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+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:164
+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:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:498
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:523
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:529
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:538
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:551 private/share/share.php:579
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:559
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:566
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:645
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:783
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:844
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:955
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:962
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:968
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1383
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1392
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1407
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1419
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1433
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ta_IN/settings.po b/l10n/ta_IN/settings.po
new file mode 100644
index 0000000000..52bebf6b1d
--- /dev/null
+++ b/l10n/ta_IN/settings.po
@@ -0,0 +1,885 @@
+# 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-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:317
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:354
+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/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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: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:81
+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:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:50 personal.php:51
+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:223
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:230
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:235
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:292
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:294
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:300
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:312
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:314
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:345
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:367
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:380
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:381
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:384
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:388
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:389
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:394
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:395
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:427
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:428
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:434 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:438 templates/personal.php:199
+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:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+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/ta_IN/user_ldap.po b/l10n/ta_IN/user_ldap.po
new file mode 100644
index 0000000000..546db3ae84
--- /dev/null
+++ b/l10n/ta_IN/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-05-01 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_IN\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:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+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:984
+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 insensitive 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/ta_IN/user_webdavauth.po b/l10n/ta_IN/user_webdavauth.po
new file mode 100644
index 0000000000..f0e7f53154
--- /dev/null
+++ b/l10n/ta_IN/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-05-01 01:55-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_IN\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/ta_LK/core.po b/l10n/ta_LK/core.po
index 01f4c51118..b2c1e72c4d 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "ஞாயிற்றுக்கிழமை"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "திங்கட்கிழமை"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "செவ்வாய்க்கிழமை"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "புதன்கிழமை"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "வியாழக்கிழமை"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "வெள்ளிக்கிழமை"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "சனிக்கிழமை"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "தை"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "மாசி"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "பங்குனி"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "சித்திரை"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "வைகாசி"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "ஆனி"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "ஆடி"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "ஆவணி"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "புரட்டாசி"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "ஐப்பசி"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "கார்த்திகை"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "மார்கழி"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "அமைப்புகள்"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "சேமிக்கப்படுகிறது..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "செக்கன்களுக்கு முன்"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "இன்று"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "நேற்று"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "கடந்த மாதம்"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "கடந்த வருடம்"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "வருடங்களுக்கு முன்"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "தெரிவுசெய்க "
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "ஆம்"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "இல்லை"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "தெரிவுசெய்க "
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "சரி"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "இரத்து செய்க"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr "பகிர்வு"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "வழு"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "பகிரும் போதான வழு"
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "கடவுச்சொல்லை பாதுகாத்தல்"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "கடவுச்சொல்"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "காலாவதி தேதியை குறிப்பிடுக"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "காலவதியாகும் திகதி"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "மின்னஞ்சலினூடான பகிர்வு: "
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "நபர்கள் யாரும் இல்லை"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "குழு"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "மீள்பகிர்வதற்கு அனுமதி இல்லை "
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "பகிரப்படாதது"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "தொகுக்க முடியும்"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "கட்டுப்பாடான அணுகல்"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "உருவவாக்கல்"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "இற்றைப்படுத்தல்"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "நீக்குக"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "பகிர்தல்"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "கடவுச்சொல் பாதுகாக்கப்பட்டது"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "எச்சரிக்கை"
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "கடவுச்சொல்"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 66dbd64884..a641e29c61 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "கோப்புகள்"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது"
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr "கோப்பு பதிவேற்றம் செயல்பா
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} ஏற்கனவே உள்ளது"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "பகிர்வு"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "பெயர்மாற்றம்"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "வழு"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "நிலுவையிலுள்ள"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "வழு"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "பெயர்"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "அளவு"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "மாற்றப்பட்டது"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "பெயர்"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "அளவு"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "மாற்றப்பட்டது"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr "ZIP கோப்புகளுக்கான ஆகக்கூடி
 msgid "Save"
 msgstr "சேமிக்க "
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "புதிய"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "கோப்பு உரை"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "கோப்புறை"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "இணைப்பிலிருந்து"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "பதிவேற்றலை இரத்து செய்க"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "பதிவிறக்குக"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "நீக்குக"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "பதிவேற்றல் மிகப்பெரியது"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது."
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "தற்போது வருடப்படுபவை"
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index d0f415fd5c..bb291cdc94 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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,6 +17,166 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "இடம்"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "ஓம்புனர்"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "பயனாளர் பெயர்"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "கடவுச்சொல்"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "பகிர்வு"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "அனுமதி வழங்கப்பட்டது"
@@ -41,29 +201,29 @@ msgstr "Google இயக்க சேமிப்பகத்தை தகமை
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index 345631dfe3..87be2e3233 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "பகிரப்பட்டது {சொந்தகாரர்}"
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "பதிவிறக்குக"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index daa23bb0de..dffd9f1b12 100644
--- a/l10n/ta_LK/files_trashbin.po
+++ b/l10n/ta_LK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "பெயர்"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "வழு"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "பெயர்"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "நீக்குக"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 334ff77919..ba2d0e979d 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "வீசொலிப் பூட்டு பதிவிறக்கம் நிறுத்தப்பட்டுள்ளது."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "கோப்புகள்ஒன்றன் பின் ஒன்றாக பதிவிறக்கப்படவேண்டும்."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "கோப்புகளுக்கு செல்க"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "வீ சொலிக் கோப்புகளை உருவாக்குவதற்கு தெரிவுசெய்யப்பட்ட கோப்புகள் மிகப்பெரியவை"
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "பிரிவு \"%s\" ஐ கண்டுப்பிடிக்க முடியவில்லை"
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 7010ade872..702190a612 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "மறைக்குறியீடு"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "மின்னஞ்சல் சேமிக்கப்பட்டது"
@@ -114,6 +124,16 @@ msgstr "குழுவை நீக்க முடியாது"
 msgid "Unable to delete user"
 msgstr "பயனாளரை நீக்க முடியாது"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "மொழி மாற்றப்பட்டது"
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr "இற்றைப்படுத்தல்"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "_மொழி_பெயர்_"
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "சேவையக முகவரி"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "துறை "
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "சான்று ஆவணங்கள்"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "மேலதிக"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "குறைவான"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr "மொழி"
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "புகுபதிகை"
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 8776b8c687..50517d37c3 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -86,65 +86,65 @@ msgstr ""
 msgid "Error"
 msgstr "வழு"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 8c91096434..81da1fc752 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -59,207 +59,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "ఆదివారం"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "సోమవారం"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "మంగళవారం"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "బుధవారం"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "గురువారం"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "శుక్రవారం"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "శనివారం"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "జనవరి"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "ఫిబ్రవరి"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "మార్చి"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "ఏప్రిల్"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "మే"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "జూన్"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "జూలై"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "ఆగస్ట్"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "సెప్టెంబర్"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "అక్టోబర్"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "నవంబర్"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "డిసెంబర్"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "అమరికలు"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "క్షణాల క్రితం"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n నిమిషం క్రితం"
 msgstr[1] "%n నిమిషాల క్రితం"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n గంట క్రితం"
 msgstr[1] "%n గంటల క్రితం"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "ఈరోజు"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "నిన్న"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n రోజు క్రితం"
 msgstr[1] "%n రోజుల క్రితం"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "పోయిన నెల"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n నెల క్రితం"
 msgstr[1] "%n నెలల క్రితం"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "పోయిన సంవత్సరం"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "సంవత్సరాల క్రితం"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "అవును"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "కాదు"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "సరే"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "రద్దుచేయి"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "కొనసాగించు"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,12 +291,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -324,107 +324,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr "పంపించు"
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "కాలం చెల్లు తేదీ"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "తొలగించు"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "హెచ్చరిక"
 
@@ -668,6 +677,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "సంకేతపదం"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/te/files.po b/l10n/te/files.po
index 5bedee1efa..778726338d 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "శాశ్వతంగా తొలగించు"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "పొరపాటు"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "పొరపాటు"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "పేరు"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "పరిమాణం"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "పేరు"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "పరిమాణం"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr "భద్రపరచు"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "కొత్త సంచయం"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "సంచయం"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/te/files_external.po b/l10n/te/files_external.po
index 90e1578bd1..332c62c427 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "వాడుకరి పేరు"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "సంకేతపదం"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po
index a636a2615e..2dc93abd2e 100644
--- a/l10n/te/files_sharing.po
+++ b/l10n/te/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/te/files_trashbin.po b/l10n/te/files_trashbin.po
index 4e49411bff..187f84f16a 100644
--- a/l10n/te/files_trashbin.po
+++ b/l10n/te/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "పేరు"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "పొరపాటు"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "పేరు"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "తొలగించు"
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index dd35ccc118..a4a2950982 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index 474e2dda8d..fffd255bea 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "సేవకి చిరునామా"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "మరిన్ని"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr "భాష"
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index 8d069aa14a..74e62d8f13 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr[1] ""
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:984
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index d2d3c1d59a..2eb082bbc6 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-04-26 01:54-0400\n"
+"POT-Creation-Date: 2014-05-19 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"
@@ -59,79 +59,79 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
@@ -191,75 +191,75 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its "
 "name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -291,12 +291,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -324,107 +324,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index da889ccd57..7a77d2844d 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-04-26 01:54-0400\n"
+"POT-Creation-Date: 2014-05-19 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"
@@ -28,7 +28,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -37,18 +37,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different name."
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,130 +177,134 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr ""
-
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
-msgid "Pending"
-msgstr ""
-
-#: js/filelist.js:624
-msgid "Could not rename file"
-msgstr ""
-
-#: js/filelist.js:787
-msgid "Error deleting file."
-msgstr ""
-
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:94
-msgid "\"{name}\" is an invalid file name."
-msgstr ""
-
-#: js/files.js:115
-msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
-
-#: js/files.js:119
-msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
-
-#: js/files.js:132
-msgid ""
-"Encryption App is enabled but your keys are not initialized, please log-out "
-"and log-in again"
-msgstr ""
-
-#: js/files.js:136
-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:140
-msgid ""
-"Encryption was disabled but your files are still encrypted. Please go to "
-"your personal settings to decrypt your files."
-msgstr ""
-
-#: js/files.js:329
+#: js/filelist.js:299
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
+#: js/filelist.js:602 js/filelist.js:1672
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1335
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/files.js:569 templates/index.php:79
+#: js/filelist.js:1439 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/files.js:570 templates/index.php:81
+#: js/filelist.js:1440 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: lib/app.php:86
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1580 js/filelist.js:1619
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+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:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -333,68 +341,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index eca46bd5f3..f89877ce98 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-04-26 01:54-0400\n"
+"POT-Creation-Date: 2014-05-19 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"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 43030f427e..848ceadfec 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-04-26 01:54-0400\n"
+"POT-Creation-Date: 2014-05-19 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,6 +17,166 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:598
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:608
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:630
+#: lib/config.php:621
 #, 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:632
+#: lib/config.php:623
 #, 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:634
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please "
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 129d49cfd4..b567d95929 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-04-26 01:54-0400\n"
+"POT-Creation-Date: 2014-05-19 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"
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 272c68294c..1692619285 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-04-26 01:54-0400\n"
+"POT-Creation-Date: 2014-05-19 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,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr ""
-
-#: js/trash.js:62 templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: js/trash.js:264
-msgid "Deleted Files"
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
 msgstr ""
 
 #: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:6
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:19
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:30
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index a2b4e25e56..0dc3c202cd 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-04-26 01:54-0400\n"
+"POT-Creation-Date: 2014-05-19 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"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 61fe357e38..43b18541e6 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-04-26 01:54-0400\n"
+"POT-Creation-Date: 2014-05-19 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,12 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -74,23 +77,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -276,19 +279,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -330,73 +333,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links "
+"are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 1c65929831..a4987acf8c 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-04-26 01:54-0400\n"
+"POT-Creation-Date: 2014-05-19 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:232
+#: files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:233
+#: files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:234 files.php:261
+#: files.php:237 files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:259
+#: files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: files.php:260
+#: files.php:263
 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:202
+#: setup.php:164
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:203
+#: setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: share/mailnotifications.php:72 share/mailnotifications.php:118
+#: share/mailnotifications.php:91 share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -314,73 +314,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: share/share.php:629
+#: share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links "
+"are allowed"
+msgstr ""
+
+#: share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: share/share.php:636
+#: share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: share/share.php:773
+#: share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: share/share.php:834
+#: share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: share/share.php:940
+#: share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: share/share.php:947
+#: share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: share/share.php:953
+#: share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: share/share.php:1367
+#: share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: share/share.php:1376
+#: share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: share/share.php:1391
+#: share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: share/share.php:1403
+#: share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: share/share.php:1417
+#: share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: tags.php:193
+#: tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index a12718f1e9..65154c7095 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-04-26 01:54-0400\n"
+"POT-Creation-Date: 2014-05-19 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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your owncloud."
+"log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask "
+"your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -168,7 +188,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -224,34 +244,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -297,7 +325,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -485,147 +513,142 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
 "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -778,29 +801,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong "
+"you can restore the keys. Only delete them permanently if you are sure that "
+"all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index c11ec36ab7..a7f3f843f3 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-04-26 01:54-0400\n"
+"POT-Creation-Date: 2014-05-19 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"
@@ -127,25 +127,25 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 1ddac4ff5d..1c5562b4c2 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-04-26 01:54-0400\n"
+"POT-Creation-Date: 2014-05-19 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"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 9486525543..101f07c2b8 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,202 +58,202 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "วันอาทิตย์"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "วันจันทร์"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "วันอังคาร"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "วันพุธ"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "วันพฤหัสบดี"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "วันศุกร์"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "วันเสาร์"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "มกราคม"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "กุมภาพันธ์"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "มีนาคม"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "เมษายน"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "พฤษภาคม"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "มิถุนายน"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "กรกฏาคม"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "สิงหาคม"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "กันยายน"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "ตุลาคม"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "พฤศจิกายน"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "ธันวาคม"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "กำลังบันทึกข้อมูล..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "วินาที ก่อนหน้านี้"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "วันนี้"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "เมื่อวานนี้"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "เดือนที่แล้ว"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "ปีที่แล้ว"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "ปี ที่ผ่านมา"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "เลือก"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "ตกลง"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "ไม่ตกลง"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "เลือก"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "ตกลง"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "ไฟล์ใหม่"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -285,12 +285,12 @@ msgstr "แชร์แล้ว"
 msgid "Share"
 msgstr "แชร์"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล"
 
@@ -318,107 +318,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "ใส่รหัสผ่านไว้"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "รหัสผ่าน"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "ส่งลิงก์ให้ทางอีเมล"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "ส่ง"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "กำหนดวันที่หมดอายุ"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "วันที่หมดอายุ"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "แชร์ผ่านทางอีเมล"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "ไม่พบบุคคลที่ต้องการ"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "กลุ่มผู้ใช้งาน"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "ได้แชร์ {item} ให้กับ {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "ยกเลิกการแชร์"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "สามารถแก้ไข"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "ระดับควบคุมการเข้าใช้งาน"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "สร้าง"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "อัพเดท"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "ลบ"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "แชร์"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "ใส่รหัสผ่านไว้"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "กำลังส่ง..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "ส่งอีเมล์แล้ว"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "คำเตือน"
 
@@ -662,6 +671,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "รหัสผ่าน"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index a877abec6d..a5361f46a7 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -27,7 +27,7 @@ msgstr "ไม่สามารถย้าย %s ได้ - ไฟล์ท
 msgid "Could not move %s"
 msgstr "ไม่สามารถย้าย %s ได้"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "ชื่อไฟล์ไม่สามารถเว้นว่างได้"
 
@@ -36,18 +36,18 @@ msgstr "ชื่อไฟล์ไม่สามารถเว้นว่า
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้"
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr "ไดเร็กทอรี่ไม่ถูกต้อง"
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "ไฟล์"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "การอัพโหลดถูกยกเลิก"
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,128 +177,132 @@ msgstr "การอัพโหลดไฟล์กำลังอยู่ใ
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} มีอยู่แล้วในระบบ"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "แชร์"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "เปลี่ยนชื่อ"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr ""
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "ข้อผิดพลาด"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "อยู่ระหว่างดำเนินการ"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "ข้อผิดพลาด"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "ชื่อ"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "ขนาด"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "แก้ไขแล้ว"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "พื้นที่จัดเก็บข้อมูลของคุณเต็มแล้ว ไม่สามารถอัพเดทหรือผสานไฟล์ต่างๆได้อีกต่อไป"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
-msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่"
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "ชื่อ"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "ขนาด"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "แก้ไขแล้ว"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -331,68 +339,75 @@ msgstr "ขนาดไฟล์ ZIP สูงสุด"
 msgid "Save"
 msgstr "บันทึก"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "อัพโหลดไฟล์ใหม่"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "ไฟล์ข้อความ"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "โฟลเดอร์ใหม่"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "แฟ้มเอกสาร"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "จากลิงก์"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "ยกเลิกการอัพโหลด"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "ลบ"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้"
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 5a4178fb5c..1de24ba064 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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,6 +17,166 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "ตำแหน่งที่อยู่"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "โฮสต์"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "ชื่อผู้ใช้งาน"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "รหัสผ่าน"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "แชร์"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "การเข้าถึงได้รับอนุญาตแล้ว"
@@ -41,29 +201,29 @@ msgstr "เกิดข้อผิดพลาดในการกำหนด
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 419cb84a3f..50ad345bc6 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "ถูกแชร์โดย {owner}"
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "ดาวน์โหลด"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index 71833cb7c0..0cace3ee80 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "ชื่อ"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "คืนค่า"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "ข้อผิดพลาด"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "ไม่มีอะไรอยู่ในนี้ ถังขยะของคุณยังว่างอยู่"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "ชื่อ"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "ลบแล้ว"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "ลบ"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index 368b7226e7..b8ff943bd7 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้"
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น"
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "กลับไปที่ไฟล์"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip"
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "ไม่พบหมวดหมู่ \"%s\""
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 8cacfd7496..2bcb12d9e4 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "การเข้ารหัส"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "อีเมลถูกบันทึกแล้ว"
@@ -114,6 +124,16 @@ msgstr "ไม่สามารถลบกลุ่มได้"
 msgid "Unable to delete user"
 msgstr "ไม่สามารถลบผู้ใช้งานได้"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "เปลี่ยนภาษาเรียบร้อยแล้ว"
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr "อัพเดท"
 msgid "Updated"
 msgstr "อัพเดทแล้ว"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "ลบแล้ว"
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "ภาษาไทย"
 
@@ -486,148 +514,143 @@ msgstr "อนุญาตให้แอปฯสามารถใช้ API 
 msgid "Allow links"
 msgstr "อนุญาตให้ใช้งานลิงก์ได้"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "อนุญาตให้ผู้ใช้งานสามารถแชร์ข้อมูลรายการต่างๆไปให้สาธารณะชนเป็นลิงก์ได้"
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "อนุญาตให้ผู้ใช้งานสามารถแชร์ข้อมูลรายการต่างๆไปให้สาธารณะชนเป็นลิงก์ได้"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลรายการต่างๆที่ถูกแชร์มาให้ตัวผู้ใช้งานได้เท่านั้น"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลถึงใครก็ได้"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น"
+
 #: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "ที่อยู่เซิร์ฟเวอร์"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "พอร์ต"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "ข้อมูลส่วนตัวสำหรับเข้าระบบ"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "ระดับการเก็บบันทึก log"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "มาก"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "น้อย"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "รุ่น"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr "ภาษา"
 msgid "Help translate"
 msgstr "ช่วยกันแปล"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "ชื่อที่ใช้สำหรับเข้าสู่ระบบ"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 05c84d1313..dc12cfabf0 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -86,63 +86,63 @@ msgstr "เสร็จสิ้น"
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "เลือกกลุ่ม"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "ทดสอบการเชื่อมต่อสำเร็จ"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "ทดสอบการเชื่อมต่อล้มเหลว"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "คุณแน่ใจแล้วหรือว่าต้องการลบการกำหนดค่าเซิร์ฟเวอร์ปัจจุบันทิ้งไป?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "ยืนยันการลบทิ้ง"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 3c8d0e8722..7f439d02f1 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-24 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 11:00+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"PO-Revision-Date: 2014-05-18 18:22+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"
@@ -62,79 +62,79 @@ msgstr "Kullanılabilir geçici profil resmi yok, tekrar deneyin"
 msgid "No crop data provided"
 msgstr "Kesme verisi sağlanmamış"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Pazar"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Salı"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Çarşamba"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Perşembe"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Cuma"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Ocak"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Şubat"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Mart"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Nisan"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mayıs"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Haziran"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Temmuz"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Ağustos"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Eylül"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Ekim"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Kasım"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Aralık"
 
@@ -194,75 +194,75 @@ msgstr "geçen yıl"
 msgid "years ago"
 msgstr "yıllar önce"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Seç"
-
-#: 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:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Evet"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Hayır"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Seç"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Dosya seçici şablonu yüklenirken hata: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Tamam"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "İleti şablonu yüklenirken hata: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 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:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Bir dosya çakışması"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Yeni Dosyalar"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr "Zaten mevcut olan dosyalar"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Hangi dosyaları saklamak istiyorsunuz?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "İki sürümü de seçerseniz, kopyalanan dosyanın ismine bir sayı ilave edilecektir."
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "İptal"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Devam et"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(tümü seçildi)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} seçildi)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Dosya mevcut şablonu yüklenirken hata"
 
@@ -294,12 +294,12 @@ msgstr "Paylaşılan"
 msgid "Share"
 msgstr "Paylaş"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Hata"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Paylaşım sırasında hata"
 
@@ -327,107 +327,116 @@ msgstr "Kullanıcı veya grup ile paylaş..."
 msgid "Share link"
 msgstr "Paylaşma bağlantısı"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek"
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr "Öntanımlı olarak herkese açık bağlantı {days} gün sonra sona erecek"
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Parola koruması"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Parola"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr "Herkese açık bağlantı için bir parola seçin"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Herkes Tarafından Gönderime İzin Ver"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Bağlantıyı e-posta ile gönder"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Gönder"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Son kullanma tarihini ayarla"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Son kullanım tarihi"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "E-posta ile paylaş:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Kişi bulunamadı"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "grup"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Tekrar paylaşmaya izin verilmiyor"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "{item} içinde {user} ile paylaşılanlar"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Paylaşılmayan"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "e-posta ile bildir"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "düzenleyebilir"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "erişim kontrolü"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "oluştur"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "güncelle"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "sil"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "paylaş"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Parola korumalı"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Son kullanma tarihi kaldırma hatası"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Son kullanma tarihi ayarlama hatası"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Gönderiliyor..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "E-posta gönderildi"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Uyarı"
 
@@ -671,6 +680,10 @@ msgstr "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=
 msgid "Create an <strong>admin account</strong>"
 msgstr "Bir <strong>yönetici hesabı</strong> oluşturun"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Parola"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr "Depolama ve veritabanı"
@@ -725,7 +738,7 @@ msgstr "Uygulama, doğru çalışabilmesi için JavaScript'in etkinleştirilmesi
 #: templates/layout.user.php:44
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr "%s mevcut. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın."
+msgstr "%s kullanılabilir. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın."
 
 #: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 2e078e122b..a2665c64f1 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"PO-Revision-Date: 2014-05-18 18:22+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"
@@ -32,7 +32,7 @@ msgstr "%s taşınamadı. Bu isimde dosya zaten mevcut"
 msgid "Could not move %s"
 msgstr "%s taşınamadı"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Dosya adı boş olamaz."
 
@@ -41,18 +41,18 @@ msgstr "Dosya adı boş olamaz."
 msgid "\"%s\" is an invalid file name."
 msgstr "'%s' geçersiz bir dosya adı."
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Hedef klasör taşındı veya silindi."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -144,28 +144,32 @@ msgstr "Yükleme başarısız. Dosya bilgisi alınamadı."
 msgid "Invalid directory."
 msgstr "Geçersiz dizin."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Dosyalar"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Tüm dosyalar"
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Bir dizin veya 0 bayt olduğundan {filename} yüklenemedi"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Toplam dosya boyutu {size1}, {size2} gönderme sınırını aşıyor"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 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:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Yükleme iptal edildi."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Sunucudan sonuç alınamadı."
 
@@ -178,131 +182,135 @@ msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işlem
 msgid "URL cannot be empty"
 msgstr "URL boş olamaz"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} zaten mevcut"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Dosya oluşturulamadı"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Klasör oluşturulamadı"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "Adres getirilirken hata"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Paylaş"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Kalıcı olarak sil"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
-msgstr "İsim değiştir."
+msgstr "Yeniden adlandır"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Dosya taşıma hatası"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Hata"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "Dosya taşıma hatası."
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Dosya taşıma hatası"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Hata"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Dosya adlandırılamadı"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Dosya silinirken hata."
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "İsim"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Boyut"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Değiştirilme"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dizin"
 msgstr[1] "%n dizin"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n dosya"
 msgstr[1] "%n dosya"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} ve {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n dosya yükleniyor"
 msgstr[1] "%n dosya yükleniyor"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr "\"{name}\" geçersiz bir dosya adı."
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Depolama alanınız dolu, artık dosyalar güncellenmeyecek veya eşitlenmeyecek."
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın"
 
-#: js/files.js:136
+#: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Şifreleme Uygulaması için geçersiz özel anahtar. Lütfen şifreli dosyalarınıza erişimi tekrar kazanabilmek için kişisel ayarlarınızdan özel anahtar parolanızı güncelleyin."
 
-#: js/files.js:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Şifreleme işlemi durduruldu ancak dosyalarınız şifreli. Dosyalarınızın şifresini kaldırmak için lütfen kişisel ayarlar kısmına geçin."
 
-#: js/files.js:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} ve {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "İsim"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Boyut"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Değiştirilme"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s yeniden adlandırılamadı"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr "Yükle (azami: %s)"
@@ -339,68 +347,75 @@ msgstr "ZIP dosyaları için en fazla girdi boyutu"
 msgid "Save"
 msgstr "Kaydet"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "Yeni"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "Yeni metin dosyası"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Metin dosyası"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Yeni klasör"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Klasör"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Bağlantıdan"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Silinmiş dosyalar"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Yüklemeyi iptal et"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Burada hiçbir şey yok. Bir şeyler yükleyin!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "İndir"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Sil"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Yükleme çok büyük"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Dosyalar taranıyor, lütfen bekleyin."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Güncel tarama"
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index 76d669faea..2a93a66dfa 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/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-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 10:51+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-14 23:42+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"
@@ -68,7 +68,7 @@ msgid ""
 "Your private key is not valid! Likely your password was changed outside of "
 "%s (e.g. your corporate directory). You can update your private key password"
 " in your personal settings to recover access to your encrypted files."
-msgstr "Gizli anahtarınız geçerli değil! Muhtemelen parolanız ownCloud sistemi %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz."
+msgstr "Gizli anahtarınız geçerli değil! Muhtemelen parolanız %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz."
 
 #: files/error.php:19
 msgid ""
@@ -113,91 +113,91 @@ msgstr "Doğrudan şuraya gidin:"
 msgid "personal settings"
 msgstr "kişisel ayarlar"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Şifreleme"
 
-#: 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 "Kurtarma anahtarını etkinleştir (parola kaybı durumunda kullanıcı dosyalarının kurtarılmasına izin verir):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Kurtarma anahtarı parolası"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Kurtarma anahtarı parolasını yenileyin"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Etkinleştirildi"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Devre dışı"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Kurtarma anahtarı parolasını değiştir:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Eski Kurtarma anahtar parolası"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Yeni Kurtarma anahtar parolası"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Yeni Kurtarma anahtarı parolasını yenileyin"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Parola Değiştir"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Özel anahtar parolanız artık oturum açma parolanızla eşleşmiyor:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Eski özel anahtar parolanızı geçerli oturum açma parolanız olarak ayarlayın."
 
-#: 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 "Eğer eski parolanızı hatırlamıyorsanız, yöneticinizden dosyalarınızı kurtarmasını talep edebilirsiniz."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Eski oturum açma parolası"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Geçerli oturum açma parolası"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Özel Anahtar Parolasını Güncelle"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Parola kurtarmayı etkinleştir:"
 
-#: 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 "Bu seçeneği etkinleştirmek, parola kaybı durumunda şifrelenmiş dosyalarınıza erişimi yeniden kazanmanızı sağlayacaktır"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Dosya kurtarma ayarları güncellendi"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Dosya kurtarma güncellenemedi"
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index 02bf5aab5f..c0624d9230 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/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-04-10 01:54-0400\n"
-"PO-Revision-Date: 2014-04-09 20:50+0000\n"
-"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,166 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "Yerel"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Konum"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr "Anahtar"
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr "Parola"
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr "Bucket"
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr "Amazon S3 ve uyumlu olanlar"
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "Erişim Anahtarı"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr "Gizli Anahtar"
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "Makine Adı (isteğe bağlı)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "Bağl. Nok. (isteğe bağlı)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "Bölge (isteğe bağlı)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "SSL'yi Etkinleştir"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr "Yol Biçemini Etkinleştir"
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr "Uyg. anahtarı"
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr "Uyg. parolası"
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Sunucu"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Kullanıcı Adı:"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Parola:"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "Kök"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "Güvenli ftps://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr "İstemci Kimliğ"
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr "İstemci parolası"
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr "OpenStack Nesne Depolama"
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr "Kullanıcı adı (gerekli)"
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr "Bucket (gerekli)"
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr "Bölge (OpenStack Nesne Depolaması için isteğe bağlı)"
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr "API Anahtarı (Rackspace Bulut Dosyaları için gerekli)"
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr "Kiracı Adı (OpenStack Nesne Depolaması için gerekli)"
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr "Parola (OpenStack Nesne Depolaması için gerekli)"
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr "Hizmet Adı (OpenStack Nesne Depolaması için gerekli)"
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr "Kimlik uç nokta adresi (OpenStack Nesne Depolaması için gerekli)"
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr "Saniye cinsinden HTTP istek zaman aşımı (isteğe bağlı)"
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Paylaş"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr "OC oturumu kullanarak SMB / CIFS"
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr "Paylaşım olarak kullanıcı adı"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "Güvenli https://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "Uzak alt klasör"
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Giriş kabul edildi"
@@ -42,29 +202,29 @@ msgstr "Google Drive depo yapılandırma hatası"
 msgid "Saved"
 msgstr "Kaydedildi"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr "<b>Not:</b> "
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr "ve"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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 "<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:626
+#: lib/config.php:623
 #, 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 "<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:628
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 461d684d2a..223eeef9a7 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-22 01:54-0400\n"
-"PO-Revision-Date: 2014-04-21 16:38+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -36,7 +36,7 @@ msgstr "Parola"
 
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr "Üzgünüz, bu bağlantı artık çalışıyor gibi görünmüyor"
+msgstr "Üzgünüz, bu bağlantı artık çalışıyor gibi görünmüyor."
 
 #: templates/part.404.php:4
 msgid "Reasons might be:"
@@ -58,16 +58,15 @@ msgstr "paylaşım devre dışı"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Daha fazla bilgi için bu bağlantıyı aldığınız kişi ile iletişime geçin."
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "paylaşan: %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "İndir"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr "İndir: %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Doğrudan bağlantı"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index e3d0ae59b8..c91d9d3215 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,38 +29,34 @@ msgstr "%s alıcı olarak silinemedi"
 msgid "Couldn't restore %s"
 msgstr "%s geri yüklenemedi"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "Silinmiş dosyalar"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Hata"
-
-#: 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:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Burada hiçbir şey yok. Çöp kutunuz tamamen boş!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "İsim"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Geri yükle"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Hata"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "geri yüklendi"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Burada hiçbir şey yok. Çöp kutunuz tamamen boş!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "İsim"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Silindi"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Sil"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 30040bccbc..fbd5345109 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 14:20+0000\n"
+"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"PO-Revision-Date: 2014-05-18 18:22+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,13 +21,16 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Sunucuya güvenilmeyen bir alan adından ulaşıyorsunuz."
 
-#: base.php:724
-msgid "Please contact your administrator"
-msgstr "Lütfen yöneticinizle iletişime geçin"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr "Lütfen yöneticiniz ile iletişime geçin. Eğer bu örneğin bir yöneticisi iseniz, config/config.php dosyası içerisindeki \"trusted_domain\" ayarını yapılandırın. Bu yapılandırmanın bir örneği config/config.sample.php dosyasında verilmiştir."
 
 #: private/app.php:236
 #, php-format
@@ -77,23 +80,23 @@ msgstr "Geçersiz resim"
 msgid "web services under your control"
 msgstr "kontrolünüzün altındaki web hizmetleri"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP indirmeleri kapatıldı."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Dosyaların tek tek indirilmesi gerekmektedir."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Dosyalara Dön"
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -279,19 +282,19 @@ msgstr "Bir yönetici kullanıcı adı ayarlayın."
 msgid "Set an admin password."
 msgstr "Bir yönetici kullanıcı parolası ayarlayın."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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 eşitlemesine izin vermek üzere düzgün bir şekilde yapılandırılmamış. WebDAV arayüzü sorunlu görünüyor."
 
-#: private/setup.php:203
+#: private/setup.php:165
 #, 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:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s sizinle »%s« paylaşımında bulundu"
@@ -333,73 +336,79 @@ msgstr "%s paylaşımı, %s grubu mevcut olmadığından başarısız oldu"
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "%s paylaşımı, %s kullanıcısı %s grup üyesi olmadığından başarısız oldu"
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Herkese açık bir bağlantı oluşturmak için bir parola belirtmeniz gerekiyor. Sadece korunmuş bağlantılara izin verilmektedir"
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "%s paylaşımı, bağlantılar ile paylaşım izin verilmediğinden başarısız oldu"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "%s paylaşım türü %s için geçerli değil"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "%s için izinler, izinler %s için verilen izinleri aştığından dolayı ayarlanamadı"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "%s için izinler öge bulunamadığından ayarlanamadı"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Paylaşma arka ucu %s OCP\\Share_Backend arayüzünü desteklemeli"
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Paylaşım arka ucu %s bulunamadı"
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "%s için paylaşım arka ucu bulunamadı"
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "%s paylaşımı, %s kullanıcısı özgün paylaşan kişi olduğundan başarısız oldu"
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "%s paylaşımı, izinler %s için verilen izinleri aştığından dolayı başarısız oldu"
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "%s paylaşımı, tekrar paylaşımın izin verilmemesinden dolayı başarısız oldu"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "%s paylaşımı, %s için arka ucun kaynağını bulamamasından dolayı başarısız oldu"
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr "%s paylaşımı, dosyanın dosya önbelleğinde bulunamamasınndan dolayı başarısız oldu"
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "\"%s\" kategorisi bulunamadı"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 83c08a1580..e884500ac4 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"PO-Revision-Date: 2014-05-18 18:22+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"
@@ -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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "Gönderme kipi"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Şifreleme"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "Kimlik doğrulama yöntemi"
 
@@ -102,6 +102,16 @@ msgstr "Dosyalarınızın şifresi kaldırılamadı, lütfen owncloud.log dosyas
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "Dosyalarınızın şifresi kaldırılamadı, parolanızı denetleyip yeniden deneyin."
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Şifreleme anahtarları kalıcı olarak silindi"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Şifreleme anahtarlarınız kalıcı olarak silinemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın"
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "E-posta kaydedildi"
@@ -118,6 +128,16 @@ msgstr "Grup silinemiyor"
 msgid "Unable to delete user"
 msgstr "Kullanıcı silinemiyor"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Yedekler başarıyla geri yüklendi"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Şifreleme anahtarlarınız geri yüklenemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın"
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Dil değiştirildi"
@@ -173,7 +193,7 @@ msgstr "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme
 msgid "Unable to change password"
 msgstr "Parola değiştirilemiyor"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Gönderiliyor..."
 
@@ -229,34 +249,42 @@ msgstr "Güncelleme"
 msgid "Updated"
 msgstr "Güncellendi"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "Bir profil fotoğrafı seçin"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Çok güçsüz parola"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Güçsüz parola"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "Normal parola"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "İyi parola"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Güçlü parola"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dosyaların şifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir."
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Şifreleme anahtarlarını kalıcı olarak sil."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Şifreleme anahtarlarını geri yükle."
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "silinen:"
@@ -302,7 +330,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:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "Türkçe"
 
@@ -490,148 +518,143 @@ msgstr "Uygulamaların paylaşım API'sini kullanmasına izin ver"
 msgid "Allow links"
 msgstr "Bağlantılara izin ver"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr "Parola korumasını zorla"
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 msgid "Allow public uploads"
 msgstr "Herkes tarafından yüklemeye izin ver"
 
-#: 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:235
-msgid "Allow resharing"
-msgstr "Paylaşıma izin ver"
-
-#: 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:243
-msgid "Allow users to share with anyone"
-msgstr "Kullanıcıların her şeyi paylaşmalarına izin ver"
-
-#: 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:253
-msgid "Allow mail notification"
-msgstr "Posta bilgilendirmesine izin ver"
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr "Paylaşılmış dosyalar için kullanıcıların posta bildirimi göndermesine izin ver"
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
-msgstr ""
+msgstr "Öntanımlı son kullanma tarihini ayarla"
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr "Şu süreden sonra süresi dolsun"
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr "gün"
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
-msgstr ""
+msgstr "Son kullanma tarihini zorla"
+
+#: templates/admin.php:242
+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:252
+msgid "Allow resharing"
+msgstr "Paylaşıma izin ver"
+
+#: templates/admin.php:253
+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:260
+msgid "Allow users to share with anyone"
+msgstr "Kullanıcıların her şeyi paylaşmalarına izin ver"
+
+#: templates/admin.php:263
+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:270
-msgid "Expire shares by default after N days"
-msgstr "Paylaşımların süresini öntanımlı olarak N günden sonra doldur"
+msgid "Allow mail notification"
+msgstr "Posta bilgilendirmesine izin ver"
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr "Paylaşılmış dosyalar için kullanıcıların posta bildirimi göndermesine izin ver"
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Güvenlik"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "HTTPS bağlantısına zorla"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, 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:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen %s'a HTTPS ile bağlanın."
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "E-Posta Sunucusu"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "Bu, bildirimler gönderilirken kullanılır."
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "Kimden adresi"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "Kimlik doğrulama gerekli"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Sunucu adresi"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Kimlik Bilgileri"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "SMTP Kullanıcı Adı"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "SMTP Parolası"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "E-posta ayarlarını sına"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "E-posta gönder"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Günlük"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Günlük seviyesi"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Daha fazla"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Az"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Sürüm"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -691,7 +714,7 @@ msgstr "Ticari Destek"
 
 #: templates/personal.php:8
 msgid "Get the apps to sync your files"
-msgstr "Dosyalarınızı eşitlemek için uygulamayı indirin"
+msgstr "Dosyalarınızı eşitlemek için uygulamaları indirin"
 
 #: templates/personal.php:19
 msgid "Show First Run Wizard again"
@@ -784,29 +807,33 @@ msgstr "Dil"
 msgid "Help translate"
 msgstr "Çevirilere yardım edin"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 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:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "Oturum açma parolası"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "Tüm dosyaların şifresini çöz"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın düzgün bir şekilde şifrelerinin çözüldüğünden eminseniz kalıcı olarak silin."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Şifreleme Anahtarlarını Geri Yükle"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Şifreleme Anahtarlarını Sil"
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Giriş Adı"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 85c8305611..9739390dee 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-04-22 01:54-0400\n"
-"PO-Revision-Date: 2014-04-21 16:38+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -89,65 +89,65 @@ msgstr "Başarılı"
 msgid "Error"
 msgstr "Hata"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Yapılandırma tamam"
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr "Yapılandırma geçersiz"
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr "Yapılandırma tamamlanmamış"
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Grupları seç"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr "Nesne sınıflarını seç"
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr "Nitelikleri seç"
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Bağlantı testi başarılı oldu"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Bağlantı testi başarısız oldu"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Silmeyi onayla"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] "%s grup bulundu"
 msgstr[1] "%s grup bulundu"
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "%s kullanıcı bulundu"
 msgstr[1] "%s kullanıcı bulundu"
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr "Geçersiz Makine"
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr "İstenen özellik bulunamadı"
 
diff --git a/l10n/tzm/core.po b/l10n/tzm/core.po
index 30ead15ba0..a1534c8fea 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/tzm/files.po b/l10n/tzm/files.po
index b6a4f96717..66597e67c3 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/tzm/files_external.po b/l10n/tzm/files_external.po
index 1720136d3f..69401b2381 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: tzm\n"
 "Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/tzm/files_sharing.po b/l10n/tzm/files_sharing.po
index ba2c88b85d..77b8970bc2 100644
--- a/l10n/tzm/files_sharing.po
+++ b/l10n/tzm/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: tzm\n"
 "Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/tzm/files_trashbin.po b/l10n/tzm/files_trashbin.po
index a872160a5b..aaaf221f70 100644
--- a/l10n/tzm/files_trashbin.po
+++ b/l10n/tzm/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/tzm/lib.po b/l10n/tzm/lib.po
index 54a93055d4..3e984e63d1 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: tzm\n"
 "Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/tzm/settings.po b/l10n/tzm/settings.po
index 5b93005287..3ddd46e05c 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index e58767e0b0..387eb2f449 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,202 +58,202 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "يەكشەنبە"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "دۈشەنبە"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "سەيشەنبە"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "چارشەنبە"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "پەيشەنبە"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "جۈمە"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "شەنبە"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "قەھرىتان"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "ھۇت"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "نەۋرۇز"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "ئۇمۇت"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "باھار"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "سەپەر"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "چىللە"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "تومۇز"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "مىزان"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "ئوغۇز"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "ئوغلاق"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "كۆنەك"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "تەڭشەكلەر"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "ساقلاۋاتىدۇ…"
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "بۈگۈن"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "تۈنۈگۈن"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "ھەئە"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "ياق"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "جەزملە"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "ۋاز كەچ"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -285,12 +285,12 @@ msgstr ""
 msgid "Share"
 msgstr "ھەمبەھىر"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "خاتالىق"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -318,107 +318,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr "يوللا"
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "گۇرۇپپا"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "ھەمبەھىرلىمە"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "ئۆچۈر"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "ھەمبەھىر"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "ئاگاھلاندۇرۇش"
 
@@ -662,6 +671,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "ئىم"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index 1053459eed..bcb4af9b8d 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr "%s يۆتكىيەلمەيدۇ"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "ھۆججەتلەر"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "يۈكلەشتىن ۋاز كەچتى."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,128 +177,132 @@ msgstr "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋا
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} مەۋجۇت"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "ھەمبەھىر"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "مەڭگۈلۈك ئۆچۈر"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "ئات ئۆزگەرت"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "خاتالىق"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "كۈتۈۋاتىدۇ"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "خاتالىق"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "ئاتى"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "چوڭلۇقى"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "ئۆزگەرتكەن"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "ئاتى"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "چوڭلۇقى"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "ئۆزگەرتكەن"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -331,68 +339,75 @@ msgstr ""
 msgid "Save"
 msgstr "ساقلا"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "يېڭى"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "تېكىست ھۆججەت"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "يېڭى قىسقۇچ"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "قىسقۇچ"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "ئۆچۈرۈلگەن ھۆججەتلەر"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "يۈكلەشتىن ۋاز كەچ"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "بۇ جايدا ھېچنېمە يوق. Upload something!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "چۈشۈر"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "ئۆچۈر"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "يۈكلەندىغىنى بەك چوڭ"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ug/files_external.po b/l10n/ug/files_external.po
index c200c63e02..0dbaea20ca 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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,6 +17,166 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "ئورنى"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "باش ئاپپارات"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "ئىشلەتكۈچى ئاتى"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "ئىم"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "ھەمبەھىر"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index 96d546aec2..f12130e0fd 100644
--- a/l10n/ug/files_sharing.po
+++ b/l10n/ug/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -58,16 +58,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "چۈشۈر"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ug/files_trashbin.po b/l10n/ug/files_trashbin.po
index 31b2c70a5b..c88e107c29 100644
--- a/l10n/ug/files_trashbin.po
+++ b/l10n/ug/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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 "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "ئاتى"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "خاتالىق"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "ئاتى"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "ئۆچۈرۈلدى"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "ئۆچۈر"
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index 787145dd80..5e8b2f56a8 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index 3107e223b8..b2085e87a3 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "شىفىرلاش"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -99,6 +99,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "تورخەت ساقلاندى"
@@ -115,6 +125,16 @@ msgstr "گۇرۇپپىنى ئۆچۈرەلمىدى"
 msgid "Unable to delete user"
 msgstr "ئىشلەتكۈچىنى ئۆچۈرەلمىدى"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "تىل ئۆزگەردى"
@@ -170,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -226,34 +246,42 @@ msgstr "يېڭىلا"
 msgid "Updated"
 msgstr "يېڭىلاندى"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "ئۆچۈرۈلگەن"
@@ -299,7 +327,7 @@ msgstr "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "ئۇيغۇرچە"
 
@@ -487,148 +515,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "بىخەتەرلىك"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "مۇلازىمېتىر ئادرىسى"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "ئېغىز"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "خاتىرە"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "خاتىرە دەرىجىسى"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "تېخىمۇ كۆپ"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "ئاز"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "نەشرى"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +804,33 @@ msgstr "تىل"
 msgid "Help translate"
 msgstr "تەرجىمىگە ياردەم"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "تىزىمغا كىرىش ئاتى"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index 1675450b5c..f2ef075811 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -86,63 +86,63 @@ msgstr ""
 msgid "Error"
 msgstr "خاتالىق"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 82100849f0..a546c4d3df 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 16:30+0000\n"
-"Last-Translator: azdk94 <azdk94@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,79 +60,79 @@ msgstr "Немає доступного тимчасового профілю д
 msgid "No crop data provided"
 msgstr "Немає інформації щодо обрізки даних"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Неділя"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Понеділок"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Вівторок"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Середа"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Четвер"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "П'ятниця"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Субота"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Січень"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Лютий"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Березень"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Квітень"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Травень"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Червень"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Липень"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Серпень"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Вересень"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Жовтень"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Листопад"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Грудень"
 
@@ -196,76 +196,76 @@ msgstr "минулого року"
 msgid "years ago"
 msgstr "роки тому"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Обрати"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Помилка при завантаженні шаблону вибору: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Так"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Ні"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Обрати"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Помилка при завантаженні шаблону вибору: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Помилка при завантаженні шаблону повідомлення: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} файловий конфлікт"
 msgstr[1] "{count} файлових конфліктів"
 msgstr[2] "{count} файлових конфліктів"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Один файловий конфлікт"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "Нових Файлів"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Які файли ви хочете залишити?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Якщо ви оберете обидві версії, скопійований файл буде мати номер, доданий у його ім'я."
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Відмінити"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Продовжити"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(все вибрано)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} вибрано)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Помилка при завантаженні файлу існуючого шаблону"
 
@@ -297,12 +297,12 @@ msgstr "Опубліковано"
 msgid "Share"
 msgstr "Поділитися"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Помилка"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Помилка під час публікації"
 
@@ -330,107 +330,116 @@ msgstr "Поділитися з користувачем або групою ...
 msgid "Share link"
 msgstr "Опублікувати посилання"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Захистити паролем"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Пароль"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Дозволити Публічне Завантаження"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Ел. пошта належить Пану"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Надіслати"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Встановити термін дії"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Термін дії"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Опублікувати через Ел. пошту:"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Жодної людини не знайдено"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "група"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Пере-публікація не дозволяється"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Опубліковано {item} для {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Закрити доступ"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "повідомити по Email"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "може редагувати"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "контроль доступу"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "створити"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "оновити"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "видалити"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "опублікувати"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Захищено паролем"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Помилка при відміні терміна дії"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Помилка при встановленні терміна дії"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Надсилання..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Ел. пошта надіслана"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Попередження"
 
@@ -674,6 +683,10 @@ msgstr "Для отримання інформації, як правильно
 msgid "Create an <strong>admin account</strong>"
 msgstr "Створити <strong>обліковий запис адміністратора</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Пароль"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index e1581c7f5e..3d7ac687ef 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -28,7 +28,7 @@ msgstr "Не вдалося перемістити %s - Файл з таким 
 msgid "Could not move %s"
 msgstr "Не вдалося перемістити %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr " Ім'я файлу не може бути порожнім."
 
@@ -37,18 +37,18 @@ msgstr " Ім'я файлу не може бути порожнім."
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -140,28 +140,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr "Невірний каталог."
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Файли"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Завантаження перервано."
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -174,134 +178,138 @@ msgstr "Виконується завантаження файлу. Закрит
 msgid "URL cannot be empty"
 msgstr "URL не може бути порожнім"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} вже існує"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Не вдалося створити файл"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Не вдалося створити теку"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Поділитися"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Видалити назавжди"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Перейменувати"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Помилка переміщення файлу"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі."
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Помилка"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Очікування"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Помилка переміщення файлу"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Помилка"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Неможливо перейменувати файл"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Ім'я"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Розмір"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Змінено"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n тека"
 msgstr[1] "%n тека"
 msgstr[2] "%n теки"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n файл"
 msgstr[1] "%n файлів"
 msgstr[2] "%n файли"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше сховище майже повне ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
-msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Ім'я"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Розмір"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Змінено"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s не може бути перейменований"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -338,68 +346,75 @@ msgstr "Максимальний розмір завантажуємого ZIP 
 msgid "Save"
 msgstr "Зберегти"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Створити"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Текстовий файл"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Нова тека"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Тека"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "З посилання"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Видалено файлів"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Перервати завантаження"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "Тут нічого немає. Відвантажте що-небудь!"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Видалити"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Файл занадто великий"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері."
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Файли скануються, зачекайте, будь-ласка."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Поточне сканування"
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index e176fae6bc..e4b7f894b2 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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,6 +18,166 @@ 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"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Місце"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Хост"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Ім'я користувача"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Пароль"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Поділитися"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Доступ дозволено"
@@ -42,29 +202,29 @@ msgstr "Помилка при налаштуванні сховища Google Dri
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index b54f300956..69ca114f3c 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +18,7 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Опублікував {owner}"
 
@@ -58,16 +58,15 @@ msgstr "обмін заборонений"
 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:21
+msgid "Download"
+msgstr "Завантажити"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "Пряме посилання"
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index 8c04df52af..eeb769ee30 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Неможливо видалити %s назавжди"
 msgid "Couldn't restore %s"
 msgstr "Неможливо відновити %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "Ім'я"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Відновити"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Помилка"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "відновлено"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Нічого немає. Ваший кошик для сміття пустий!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Ім'я"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Видалено"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Видалити"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index 0641a0817f..20fe4bc766 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -17,12 +17,15 @@ 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"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr "Невірне зображення"
 msgid "web services under your control"
 msgstr "підконтрольні Вам веб-сервіси"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP завантаження вимкнено."
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "Файли повинні бути завантаженні послідовно."
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Повернутися до файлів"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "Вибрані фали завеликі для генерування zip файлу."
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr "Встановіть ім'я адміністратора."
 msgid "Set an admin password."
 msgstr "Встановіть пароль адміністратора."
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>."
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s розподілено »%s« з тобою"
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Не вдалося знайти категорію \"%s\""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 3cb255ade6..b069e649be 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Шифрування"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -99,6 +99,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Адресу збережено"
@@ -115,6 +125,16 @@ msgstr "Не вдалося видалити групу"
 msgid "Unable to delete user"
 msgstr "Не вдалося видалити користувача"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Мова змінена"
@@ -170,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -226,34 +246,42 @@ msgstr "Оновити"
 msgid "Updated"
 msgstr "Оновлено"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "Дуже слабкий пароль"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "Слабкий пароль"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "Добрий пароль"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "Надійний пароль"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "видалені"
@@ -299,7 +327,7 @@ msgstr "Потрібно задати вірний пароль"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -487,148 +515,143 @@ msgstr "Дозволити програмам використовувати API
 msgid "Allow links"
 msgstr "Дозволити посилання"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Дозволити користувачам відкривати спільний доступ до елементів за допомогою посилань"
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "Дозволити користувачам відкривати спільний доступ до елементів за допомогою посилань"
+
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "Дозволити перевідкривати спільний доступ"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "Дозволити користувачам знову відкривати спільний доступ до елементів, які вже відкриті для доступу"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "Дозволити користувачам відкривати спільний доступ для всіх"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи"
+
 #: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "Безпека"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "Примусове застосування HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Адреса сервера"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Порт"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Облікові дані"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Протокол"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "Рівень протоколювання"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "Більше"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "Менше"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Версія"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +804,33 @@ msgstr "Мова"
 msgid "Help translate"
 msgstr "Допомогти з перекладом"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Ім'я Логіну"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 01d20e34b1..5cc9f6105d 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -86,47 +86,47 @@ msgstr "Успіх"
 msgid "Error"
 msgstr "Помилка"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Оберіть групи"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "Перевірка з'єднання пройшла успішно"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "Перевірка з'єднання завершилась неуспішно"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "Підтвердіть Видалення"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -134,7 +134,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -142,11 +142,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/ur/core.po b/l10n/ur/core.po
index 7324073f77..0e80bb07b0 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,207 +58,207 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -290,12 +290,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -323,107 +323,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -667,6 +676,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/ur/files.po b/l10n/ur/files.po
index 9ec874cc06..e616dd7a01 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -334,68 +342,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ur/files_external.po b/l10n/ur/files_external.po
index bf904c2d8f..04178fa6c1 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,166 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ur/files_sharing.po b/l10n/ur/files_sharing.po
index fa231b4c39..2d8c2829a0 100644
--- a/l10n/ur/files_sharing.po
+++ b/l10n/ur/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ur/files_trashbin.po b/l10n/ur/files_trashbin.po
index 01c3eab2d4..be56090b43 100644
--- a/l10n/ur/files_trashbin.po
+++ b/l10n/ur/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/ur/lib.po b/l10n/ur/lib.po
index 60ecd96b50..ed8e53faa4 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,15 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/ur/settings.po b/l10n/ur/settings.po
index 56b4ba0d04..77bc531f1b 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index 3a8d9c43dc..ee25e8ccff 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# leostandards100 <mrshah_300@yahoo.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 18:13+0000\n"
+"Last-Translator: leostandards100 <mrshah_300@yahoo.com>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ajax/share.php:87
 msgid "Expiration date is in the past."
-msgstr ""
+msgstr "ختم ہونے کی تاریخ ماضی میں ہے."
 
 #: ajax/share.php:119 ajax/share.php:161
 #, php-format
@@ -28,27 +29,27 @@ msgstr ""
 
 #: ajax/update.php:10
 msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "بحالی موڈ چالو ہے"
 
 #: ajax/update.php:13
 msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "بحالی موڈ بند ہے"
 
 #: ajax/update.php:16
 msgid "Updated database"
-msgstr ""
+msgstr "اپ ڈیٹ ہوئ ڈیٹا بیس"
 
 #: avatar/controller.php:62
 msgid "No image or file provided"
-msgstr ""
+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"
@@ -58,386 +59,395 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
-msgstr ""
+msgstr "اتوار"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
-msgstr ""
+msgstr "سوموار"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
-msgstr ""
+msgstr "منگل"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
-msgstr ""
-
-#: js/config.php:40
-msgid "Thursday"
-msgstr ""
-
-#: js/config.php:41
-msgid "Friday"
-msgstr ""
-
-#: js/config.php:42
-msgid "Saturday"
-msgstr ""
+msgstr "بدھ"
 
 #: js/config.php:47
+msgid "Thursday"
+msgstr "جمعرات"
+
+#: js/config.php:48
+msgid "Friday"
+msgstr "جمعہ"
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr "ہفتہ"
+
+#: js/config.php:54
 msgid "January"
 msgstr "جنوری"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "فرورئ"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "مارچ"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "اپریل"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "مئی"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "جون"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "جولائی"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "اگست"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "ستمبر"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "اکتوبر"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "نومبر"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "دسمبر"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
-msgstr "سیٹینگز"
+msgstr "ترتیبات"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
-msgstr ""
+msgstr "محفوظ ھو رہا ہے ..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
-msgstr ""
+msgstr "سیکنڈز پہلے"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
-msgstr ""
+msgstr "آج"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
-msgstr ""
+msgstr "کل"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
-msgstr ""
+msgstr "پچھلے مہنیے"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
-msgstr ""
+msgstr "پچھلے سال"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
-msgstr ""
+msgstr "سالوں پہلے"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "منتخب کریں"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "ہاں"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "نہیں"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "منتخب کریں"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "اوکے"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
-msgstr ""
+msgstr "جدید فائلیں"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
-msgstr ""
+msgstr "پہلے سے موجودجدید فائلیں"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "منسوخ کریں"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
-msgstr ""
+msgstr "جاری"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
-msgstr ""
+msgstr "(سب منتخب شدہ)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
-msgstr ""
+msgstr "({گنتی} منتخب شدہ)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 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"
-msgstr ""
+msgstr "اشتراک شدہ"
 
 #: js/share.js:109
 msgid "Share"
-msgstr ""
+msgstr "اشتراک"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
-msgstr "ایرر"
+msgstr "خرابی"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
-msgstr "شئیرنگ کے دوران ایرر"
+msgstr "اشتراک کے دوران خرابی "
 
 #: js/share.js:171
 msgid "Error while unsharing"
-msgstr "شئیرنگ ختم کرنے  کے دوران ایرر"
+msgstr "اشترک ختم کرنے کے دوران خرابی"
 
 #: js/share.js:178
 msgid "Error while changing permissions"
-msgstr "اختیارات کو تبدیل کرنے کے دوران ایرر"
+msgstr "اختیارات کو تبدیل کرنے کے دوران  خرابی "
 
 #: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "آپ اور گروہ سے مشترق شدہ {گروہ } سے {مالک}"
 
 #: js/share.js:190
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "اشتراک شدہ آپ سے{مالک}"
 
 #: js/share.js:214
 msgid "Share with user or group …"
-msgstr ""
+msgstr "صارف یا مجموعہ کے ساتھ اشتراک کریں ..."
 
 #: js/share.js:220
 msgid "Share link"
+msgstr "اشتراک لنک"
+
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr "ڈیفالٹ میں عوامی لنک ختم ہو جائے گا {دن} دن"
+
+#: js/share.js:233
 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 ""
+msgstr "محفوظ پاسورڈ"
 
 #: js/share.js:235
-msgid "Send"
-msgstr ""
+msgid "Choose a password for the public link"
+msgstr "عوامی لنک کے لئےپاس ورڈ منتخب کریں"
 
-#: js/share.js:240
+#: js/share.js:241
+msgid "Allow Public Upload"
+msgstr "پبلک اپ لوڈ کرنے کی اجازت دیں"
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr "شحص کے لیے ای میل لنک"
+
+#: js/share.js:246
+msgid "Send"
+msgstr "بھجیں"
+
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "تاریخ معیاد سیٹ کریں"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "تاریخ معیاد"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
-msgstr ""
+msgstr "ای میل کے زریعے ارسال کریں"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
-msgstr "کوئی لوگ نہیں ملے۔"
+msgstr "کوئ شخص موجود نہیں "
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
-msgstr ""
+msgstr "مجموعہ"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
-msgstr "دوبارہ شئیر کرنے کی اجازت نہیں"
+msgstr "دوبارہ اشتراک کی اجازت نہیں"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "شراکت میں {آئٹم}اور {مستخدم}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "شئیرنگ ختم کریں"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
-msgstr ""
+msgstr "ای میل کے ذریعے مطلع کریں"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
-msgstr "ایڈٹ کر سکے"
+msgstr "تبدیل کر سکے ھیں"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "اسیس کنٹرول"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "نیا بنائیں"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "اپ ڈیٹ"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "ختم کریں"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "شئیر کریں"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "پاسورڈ سے محفوظ کیا گیا ہے"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "خرابی غیر تصحیح تاریخ معیاد"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
-msgstr ""
+msgstr "خرابی  تصحیح تاریخ معیاد"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
-msgstr ""
+msgstr "ارسال ہو رہا ھے"
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
-msgstr ""
+msgstr "ارسال شدہ ای میل "
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
-msgstr ""
+msgstr "انتباہ"
 
 #: js/tags.js:4
 msgid "The object type is not specified."
-msgstr ""
+msgstr "اس چیز کی قسم کی وضاحت نہیں"
 
 #: js/tags.js:13
 msgid "Enter new"
-msgstr ""
+msgstr "جدید درج کریں"
 
 #: js/tags.js:27
 msgid "Delete"
-msgstr ""
+msgstr "حذف کریں"
 
 #: js/tags.js:31
 msgid "Add"
@@ -445,7 +455,7 @@ msgstr "شامل کریں"
 
 #: js/tags.js:39
 msgid "Edit tags"
-msgstr ""
+msgstr "ترمیم ٹیگز"
 
 #: js/tags.js:57
 msgid "Error loading dialog template: {error}"
@@ -457,18 +467,18 @@ msgstr ""
 
 #: js/update.js:8
 msgid "Please reload the page."
-msgstr ""
+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 ""
+msgstr "اپ ڈیٹ نا کامیاب تھی۔ براہ مہربانی اس مسلے کو رپورٹ کریں اس پے  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>. "
 
 #: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے"
 
 #: lostpassword/controller.php:70
 #, php-format
@@ -479,7 +489,7 @@ msgstr ""
 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}"
@@ -494,7 +504,7 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "گذارش ناکام!<br>کيا پ نے يقينی بنايا کہ  آپ کی ای میل / صارف کا نام درست تھا؟"
 
 #: lostpassword/templates/lostpassword.php:18
 msgid "You will receive a link to reset your password via Email."
@@ -515,11 +525,11 @@ 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"
-msgstr ""
+msgstr "ری سیٹ"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
@@ -551,11 +561,11 @@ msgstr ""
 
 #: strings.php:5
 msgid "Personal"
-msgstr "ذاتی"
+msgstr "شخصی"
 
 #: strings.php:6
 msgid "Users"
-msgstr "یوزرز"
+msgstr "صارفین"
 
 #: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
@@ -599,11 +609,11 @@ msgstr ""
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr "پہنچ کی اجازت نہیں"
+msgstr "رسائ منقطع ہے"
 
 #: templates/404.php:15
 msgid "Cloud not found"
-msgstr "نہیں مل سکا"
+msgstr "کلوڈ موجود نہہں"
 
 #: templates/altmail.php:2
 #, php-format
@@ -622,16 +632,16 @@ msgstr ""
 
 #: templates/altmail.php:7 templates/mail.php:20
 msgid "Cheers!"
-msgstr ""
+msgstr "واہ!"
 
 #: templates/installation.php:25 templates/installation.php:32
 #: templates/installation.php:39
 msgid "Security Warning"
-msgstr ""
+msgstr "حفاظتی انتباہ"
 
 #: templates/installation.php:26
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "آپ کا پی ایچ پی ورین نل بائٹ کے حملے کے خطرے سے دوچار  ہے (CVE-2006-7243)"
 
 #: templates/installation.php:27
 #, php-format
@@ -642,13 +652,13 @@ msgstr ""
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+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 ""
+msgstr "ایک محفوظ بے ترتیب نمبر جنریٹر کے بغیر ایک حملہ آور پاس ورڈ ری سیٹ ٹوکن کی پیشن گوئی کرنے کے قابل اور اپ کے حساب پر قبضہ کر سکتا ہے"
 
 #: templates/installation.php:40
 msgid ""
@@ -667,9 +677,13 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "پاسورڈ"
+
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "ذخیرہ اور ڈیٹا بیس"
 
 #: templates/installation.php:77
 msgid "Data folder"
@@ -709,7 +723,7 @@ msgstr "سیٹ اپ ختم کریں"
 
 #: templates/installation.php:150
 msgid "Finishing …"
-msgstr ""
+msgstr "تکمیل ..."
 
 #: templates/layout.user.php:40
 msgid ""
@@ -721,7 +735,7 @@ msgstr ""
 #: templates/layout.user.php:44
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s دستیاب ہے. اپ ڈیٹ کرنے کے  بارے میں مزید معلومات حاصل کریں."
 
 #: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
@@ -729,17 +743,17 @@ msgstr "لاگ آؤٹ"
 
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "آٹومیٹک لاگ ان مسترد"
 
 #: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr ""
+msgstr "آپ نے حال ہی میں اپنا پاس ورڈ تبدیل نہیں کیا تو، آپ کے اکاؤنٹ سے سمجھوتہ ہو سکتا ہے"
 
 #: templates/login.php:12
 msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "براہ مہربانی پھر سے اکاونٹ محفوظ کرنے کے لیے  اپنا پاس ورڈ تبدیل کریں."
 
 #: templates/login.php:17
 msgid "Server side authentication failed!"
@@ -763,7 +777,7 @@ msgstr "لاگ ان"
 
 #: templates/login.php:60
 msgid "Alternative Logins"
-msgstr ""
+msgstr "متبادل لاگ ان "
 
 #: templates/mail.php:15
 #, php-format
@@ -788,12 +802,12 @@ msgstr ""
 
 #: templates/singleuser.user.php:7 templates/update.user.php:6
 msgid "Thank you for your patience."
-msgstr ""
+msgstr "آپ کے صبر کا شکریہ"
 
 #: templates/update.admin.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "اون کلوڈ اپ ڈیٹ ہو رہا ہے ورژن %s میں, یہ تھوڑی دیر لےگا"
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index 0fa8e190f0..8b86d7e224 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 16:17+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,131 +177,135 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
-msgstr ""
+msgstr "تقسیم"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "ایرر"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "ایرر"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "اسم"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -332,70 +340,77 @@ msgstr ""
 
 #: templates/admin.php:25
 msgid "Save"
+msgstr "حفظ"
+
+#: templates/appnavigation.php:12
+msgid "WebDAV"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
-msgstr ""
+msgstr "حذف کریں"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ur_PK/files_external.po b/l10n/ur_PK/files_external.po
index aa912e8f65..baf57f37f3 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 16:17+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,6 +17,166 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "مقام"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "یوزر نیم"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "پاسورڈ"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "تقسیم"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "یو ار ایل"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -117,7 +277,7 @@ msgstr "یوزرز"
 #: templates/settings.php:118 templates/settings.php:119
 #: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
-msgstr ""
+msgstr "حذف کریں"
 
 #: templates/settings.php:132
 msgid "Enable User External Storage"
diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po
index 923108eaea..9ebbf36841 100644
--- a/l10n/ur_PK/files_sharing.po
+++ b/l10n/ur_PK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po
index 9ad17869f3..9666a11098 100644
--- a/l10n/ur_PK/files_trashbin.po
+++ b/l10n/ur_PK/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# leostandards100 <mrshah_300@yahoo.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 18:22+0000\n"
+"Last-Translator: leostandards100 <mrshah_300@yahoo.com>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,45 +21,41 @@ msgstr ""
 #: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "حذف نہیں ہو سکتا %s مستقل طور پر"
 
 #: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "بحال نہيں کيا جا سکتا %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
-msgstr ""
+msgstr "حذف شدہ فائليں"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "بحال"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr "ایرر"
 
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
-msgstr ""
+msgstr "بحال شدہ"
 
-#: templates/index.php:6
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr " یہاں کچھ بھی نہیں .آپکی ردی کی ٹوکری خالی ہے."
 
-#: templates/index.php:19
+#: templates/index.php:18
 msgid "Name"
-msgstr ""
+msgstr "اسم"
 
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
 msgid "Deleted"
-msgstr ""
+msgstr "حذف شدہ "
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
-msgstr ""
+msgstr "حذف کریں"
diff --git a/l10n/ur_PK/files_versions.po b/l10n/ur_PK/files_versions.po
index 1c1c879f12..098dbf6083 100644
--- a/l10n/ur_PK/files_versions.po
+++ b/l10n/ur_PK/files_versions.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 18:22+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,22 +22,22 @@ msgstr ""
 msgid "Could not revert: %s"
 msgstr ""
 
-#: js/versions.js:7
+#: js/versions.js:39
 msgid "Versions"
 msgstr ""
 
-#: js/versions.js:53
+#: js/versions.js:61
 msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: js/versions.js:79
+#: js/versions.js:88
 msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:116
+#: js/versions.js:126
 msgid "No other versions available"
 msgstr ""
 
-#: js/versions.js:149
+#: js/versions.js:156
 msgid "Restore"
-msgstr ""
+msgstr "بحال"
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index f8a8afab41..d6821da6eb 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 16:17+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,12 +17,15 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -63,33 +66,33 @@ msgstr ""
 
 #: 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:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,80 +332,86 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
 #: private/template/functions.php:134
 msgid "seconds ago"
-msgstr ""
+msgstr "سیکنڈز پہلے"
 
 #: private/template/functions.php:135
 msgid "%n minute ago"
@@ -418,11 +427,11 @@ msgstr[1] ""
 
 #: private/template/functions.php:137
 msgid "today"
-msgstr ""
+msgstr "آج"
 
 #: private/template/functions.php:138
 msgid "yesterday"
-msgstr ""
+msgstr "کل"
 
 #: private/template/functions.php:140
 msgid "%n day go"
@@ -432,7 +441,7 @@ msgstr[1] ""
 
 #: private/template/functions.php:142
 msgid "last month"
-msgstr ""
+msgstr "پچھلے مہنیے"
 
 #: private/template/functions.php:143
 msgid "%n month ago"
@@ -442,11 +451,11 @@ msgstr[1] ""
 
 #: private/template/functions.php:145
 msgid "last year"
-msgstr ""
+msgstr "پچھلے سال"
 
 #: private/template/functions.php:146
 msgid "years ago"
-msgstr ""
+msgstr "سالوں پہلے"
 
 #: private/user/manager.php:232
 msgid ""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index 412ae4ebb6..e289a4e13c 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 16:17+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"
@@ -41,21 +41,21 @@ msgstr ""
 
 #: admin/controller.php:99
 msgid "Email sent"
-msgstr ""
+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,32 +245,40 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
-msgstr ""
+msgstr "بہت کمزور پاسورڈ"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
-msgstr ""
+msgstr "کمزور پاسورڈ"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
-msgstr ""
+msgstr "نص نص پاسورڈ"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
-msgstr ""
+msgstr "اچھا پاسورڈ"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
+msgstr "مضبوط پاسورڈ"
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
-#: js/personal.js:313
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
 msgstr ""
 
 #: js/users.js:47
@@ -276,7 +304,7 @@ msgstr ""
 
 #: js/users.js:127 templates/users.php:168
 msgid "Delete"
-msgstr ""
+msgstr "حذف کریں"
 
 #: js/users.js:310
 msgid "add group"
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -348,7 +376,7 @@ msgstr ""
 
 #: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
-msgstr ""
+msgstr "حفاظتی انتباہ"
 
 #: templates/admin.php:50
 #, php-format
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
-msgid "More"
-msgstr ""
-
 #: templates/admin.php:427
-msgid "Less"
-msgstr ""
+msgid "More"
+msgstr "مزید"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:428
+msgid "Less"
+msgstr "کم"
+
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 33f736c85b..3f5f42e080 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 16:17+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"
@@ -86,71 +86,71 @@ msgstr ""
 msgid "Error"
 msgstr "ایرر"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
 #: templates/part.settingcontrols.php:2
 msgid "Save"
-msgstr ""
+msgstr "حفظ"
 
 #: templates/part.settingcontrols.php:4
 msgid "Test Configuration"
@@ -285,7 +285,7 @@ msgstr ""
 
 #: templates/part.wizardcontrols.php:8
 msgid "Continue"
-msgstr ""
+msgstr "جاری"
 
 #: templates/settings.php:11
 msgid ""
diff --git a/l10n/uz/core.po b/l10n/uz/core.po
index f673c079f6..b39fba457c 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,202 +58,202 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr ""
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr ""
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr ""
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr ""
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr ""
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -285,12 +285,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr ""
 
@@ -318,107 +318,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 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"
+msgid "Choose a password for the public link"
 msgstr ""
 
 #: js/share.js:241
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:245
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:246
+msgid "Send"
+msgstr ""
+
+#: js/share.js:251
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:252
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr ""
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr ""
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr ""
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -662,6 +671,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/uz/files.po b/l10n/uz/files.po
index 3642e1da36..2c5ed7e01f 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,128 +177,132 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr ""
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr ""
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -331,68 +339,75 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/uz/files_external.po b/l10n/uz/files_external.po
index 0a2cfee99a..dbb9e94578 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/uz/files_sharing.po b/l10n/uz/files_sharing.po
index fd65efd753..1360047e70 100644
--- a/l10n/uz/files_sharing.po
+++ b/l10n/uz/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-03 01:55-0400\n"
+"PO-Revision-Date: 2014-05-03 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,7 +17,7 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
+#: templates/public.php:21
+msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:53
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:57
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/uz/files_trashbin.po b/l10n/uz/files_trashbin.po
index 63c93aa279..d6e4b7c8c7 100644
--- a/l10n/uz/files_trashbin.po
+++ b/l10n/uz/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,15 +27,19 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
 msgid "restored"
 msgstr ""
 
@@ -43,22 +47,14 @@ msgstr ""
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/uz/lib.po b/l10n/uz/lib.po
index edb77f7201..4cf1df73e6 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/uz/settings.po b/l10n/uz/settings.po
index e4130ccd53..d30d36058e 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index ec8e73f8f1..7278f9e974 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-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -62,202 +62,202 @@ msgstr "Ảnh cá nhân tạm thời không có giá trị, hãy thử lại"
 msgid "No crop data provided"
 msgstr "Không có dữ liệu nguồn được cung cấp"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Chủ nhật"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Thứ 2"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Thứ 3"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Thứ 4"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Thứ 5"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Thứ "
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Thứ 7"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Tháng 1"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Tháng 2"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Tháng 3"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "Tháng 4"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Tháng 5"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Tháng 6"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Tháng 7"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "Tháng 8"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "Tháng 9"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Tháng 10"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "Tháng 11"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Tháng 12"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "Đang lưu..."
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "vài giây trước"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n phút trước"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n giờ trước"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "hôm nay"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "hôm qua"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n ngày trước"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "tháng trước"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n tháng trước"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "năm trước"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "năm trước"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Chọn"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Lỗi khi tải mẫu tập tin picker: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Có"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Không"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Chọn"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Lỗi khi tải mẫu tập tin picker: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Đồng ý"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Lỗi khi tải mẫu thông điệp: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} tập tin xung đột"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "Một tập tin xung đột"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "File mới"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 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:376
+#: js/oc-dialogs.js:435
 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:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Hủy"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Tiếp tục"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(Tất cả các lựa chọn)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} được chọn)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Lỗi khi tải tập tin mẫu đã tồn tại"
 
@@ -289,12 +289,12 @@ msgstr "Được chia sẻ"
 msgid "Share"
 msgstr "Chia sẻ"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Lỗi"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "Lỗi trong quá trình chia sẻ"
 
@@ -322,107 +322,116 @@ msgstr "Chia sẻ với người dùng hoặc nhóm"
 msgid "Share link"
 msgstr "Chia sẻ liên kết"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "Mật khẩu bảo vệ"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Mật khẩu"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Cho phép công khai tập tin tải lên"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Liên kết email tới cá nhân"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Gởi"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Đặt ngày kết thúc"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Ngày kết thúc"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Chia sẻ thông qua email"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Không tìm thấy người nào"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "nhóm"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Chia sẻ lại không được cho phép"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Đã được chia sẽ trong {item} với {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Bỏ chia sẻ"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "Thông báo qua email"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "có thể chỉnh sửa"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "quản lý truy cập"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "tạo"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "cập nhật"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "xóa"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "chia sẻ"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "Mật khẩu bảo vệ"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "Lỗi không thiết lập ngày kết thúc"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "Lỗi cấu hình ngày kết thúc"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "Đang gởi ..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Email đã được gửi"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "Cảnh báo"
 
@@ -666,6 +675,10 @@ msgstr "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem
 msgid "Create an <strong>admin account</strong>"
 msgstr "Tạo một <strong>tài khoản quản trị</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Mật khẩu"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index e11f9ad909..74ee45c5da 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -31,7 +31,7 @@ msgstr "Không thể di chuyển %s - Đã có tên tập tin này trên hệ th
 msgid "Could not move %s"
 msgstr "Không thể di chuyển %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "Tên file không được rỗng"
 
@@ -40,18 +40,18 @@ msgstr "Tên file không được rỗng"
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 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:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -143,28 +143,32 @@ msgstr "Tải lên thất bại. Không thể có được thông tin tập tin.
 msgid "Invalid directory."
 msgstr "Thư mục không hợp lệ"
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "Tập tin"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "không thể tải {filename} lên do nó là một thư mục hoặc có kích thước bằng 0 byte"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "Hủy tải lên"
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "Không thể nhận được kết quả từ máy chủ."
 
@@ -177,128 +181,132 @@ msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi t
 msgid "URL cannot be empty"
 msgstr "URL không thể để trống"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} đã tồn tại"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "Không thể tạo file"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "Không thể tạo thư mục"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "Chia sẻ"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "Xóa vĩnh vễn"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "Sửa tên"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "Lỗi di chuyển tập tin"
+#: js/filelist.js:299
+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/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "Lỗi"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "Đang chờ"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "Lỗi di chuyển tập tin"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "Lỗi"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "Không thể đổi tên file"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "Lỗi xóa file,"
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "Tên"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "Kích cỡ"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "Thay đổi"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n thư mục"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n tập tin"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} và {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Đang tải lên %n tập tin"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Your storage is full, files can not be updated or synced anymore!"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Your storage is almost full ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại"
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "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:329
-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/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} và {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "Tên"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "Kích cỡ"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "Thay đổi"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s không thể đổi tên"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -335,68 +343,75 @@ msgstr "Kích thước tối đa cho các tập tin ZIP"
 msgid "Save"
 msgstr "Lưu"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr "Tạo mới"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "File text mới"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "Tập tin văn bản"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "Tạo thư mục"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "Thư mục"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "Từ liên kết"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "File đã bị xóa"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "Hủy upload"
 
-#: templates/index.php:51
+#: templates/list.php:48
 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:56
+#: templates/list.php:53
 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:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "Tải về"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "Xóa"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "Tập tin tải lên quá lớn"
 
-#: templates/index.php:98
+#: templates/list.php:97
 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:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Tập tin đang được quét ,vui lòng chờ."
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "Hiện tại đang quét"
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index ccd6673899..d24db3d05e 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-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -18,6 +18,166 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "Vị trí"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Máy chủ"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "Tên đăng nhập"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "Mật khẩu"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "Chia sẻ"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Đã cấp quyền truy cập"
@@ -42,29 +202,29 @@ msgstr "Lỗi cấu hình lưu trữ Google Drive"
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 5d4a83da3b..20a59f48c3 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "Được chia sẽ bởi {owner}"
 
@@ -57,16 +57,15 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr " Được chia sẻ bởi %s"
+#: templates/public.php:21
+msgid "Download"
+msgstr "Tải về"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index d1d916d367..006a9abbbf 100644
--- a/l10n/vi/files_trashbin.po
+++ b/l10n/vi/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "Không thể xóa %s vĩnh viễn"
 msgid "Couldn't restore %s"
 msgstr "Không thể khôi phục %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 msgid "Deleted files"
 msgstr "File đã bị xóa"
 
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr "Lỗi"
-
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "File đã xóa"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
-msgid "restored"
-msgstr "khôi phục"
-
-#: templates/index.php:6
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Không có gì ở đây. Thùng rác của bạn rỗng!"
-
-#: templates/index.php:19
-msgid "Name"
-msgstr "Tên"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "Khôi phục"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "Lỗi"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "khôi phục"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Không có gì ở đây. Thùng rác của bạn rỗng!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "Tên"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "Đã xóa"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "Xóa"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index aa1cfdeeca..888f064cab 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -17,12 +17,15 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,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:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "Tải về ZIP đã bị tắt."
 
-#: private/files.php:233
+#: private/files.php:236
 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:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "Trở lại tập tin"
 
-#: private/files.php:259
+#: private/files.php:262
 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:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s đã chia sẻ »%s« với bạn"
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "không thể tìm thấy mục \"%s\""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 514ccecb94..94d8687769 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "Mã hóa"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -99,6 +99,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Lưu email"
@@ -115,6 +125,16 @@ msgstr "Không thể xóa nhóm"
 msgid "Unable to delete user"
 msgstr "Không thể xóa người dùng"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Ngôn ngữ đã được thay đổi"
@@ -170,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -226,34 +246,42 @@ msgstr "Cập nhật"
 msgid "Updated"
 msgstr "Đã cập nhật"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "đã xóa"
@@ -299,7 +327,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__Ngôn ngữ___"
 
@@ -487,148 +515,143 @@ msgstr "Cho phép các ứng dụng sử dụng chia sẻ API"
 msgid "Allow links"
 msgstr "Cho phép liên kết"
 
-#: 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:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 "Cho phép chia sẻ lại"
-
-#: 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: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: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:253
-msgid "Allow mail notification"
-msgstr ""
-
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
+#: templates/admin.php:242
+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:252
+msgid "Allow resharing"
+msgstr "Cho phép chia sẻ lại"
+
+#: templates/admin.php:253
+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:260
+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:263
+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:270
-msgid "Expire shares by default after N days"
+msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "Địa chỉ máy chủ"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "Cổng"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "Giấy chứng nhận"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "hơn"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "ít"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "Phiên bản"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +804,33 @@ msgstr "Ngôn ngữ"
 msgid "Help translate"
 msgstr "Hỗ trợ dịch thuật"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "Tên đăng nhập"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 29a39261a8..aa1aca36dd 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -86,63 +86,63 @@ msgstr "Thành công"
 msgid "Error"
 msgstr "Lỗi"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "Chọn nhóm"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 543b6afc92..3357b1d0ae 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -5,15 +5,15 @@
 # Translators:
 # hanfeng <appweb.cn@gmail.com>, 2013
 # smartree <smartree@gmail.com>, 2014
-# Xuetian Weng <wengxt@gmail.com>, 2013
+# Xuetian Weng <wengxt@gmail.com>, 2013-2014
 # min zhang <zm1990s@gmail.com>, 2013
 # min zhang <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: ajax/share.php:87
 msgid "Expiration date is in the past."
-msgstr ""
+msgstr "过期日期已过。"
 
 #: ajax/share.php:119 ajax/share.php:161
 #, php-format
@@ -63,224 +63,224 @@ msgstr "没有临时概览页图片可用，请重试"
 msgid "No crop data provided"
 msgstr "没有提供相应数据"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "星期日"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "星期一"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "星期二"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "星期三"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "星期四"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "星期五"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "星期六"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "一月"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "二月"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "三月"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "四月"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "五月"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "六月"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "七月"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "八月"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "九月"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "十月"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "十一月"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "十二月"
 
-#: js/js.js:489
+#: js/js.js:483
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:589
+#: js/js.js:583
 msgid "Saving..."
 msgstr "保存中"
 
-#: js/js.js:1246
+#: js/js.js:1240
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:1247
+#: js/js.js:1241
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分钟前"
 
-#: js/js.js:1248
+#: js/js.js:1242
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 小时前"
 
-#: js/js.js:1249
+#: js/js.js:1243
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:1250
+#: js/js.js:1244
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:1251
+#: js/js.js:1245
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n 天前"
 
-#: js/js.js:1252
+#: js/js.js:1246
 msgid "last month"
 msgstr "上月"
 
-#: js/js.js:1253
+#: js/js.js:1247
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n 月前"
 
-#: js/js.js:1254
+#: js/js.js:1248
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:1255
+#: js/js.js:1249
 msgid "years ago"
 msgstr "年前"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "选择(&C)..."
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "加载文件分拣模板出错: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "是"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "否"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "选择(&C)..."
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "加载文件分拣模板出错: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "好"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "加载消息模板出错: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} 个文件冲突"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "1个文件冲突"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "新文件"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
-msgstr ""
+msgstr "已经存在的文件"
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "想要保留哪一个文件呢？"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "如果同时选择了连个版本，复制的文件名将会添加上一个数字。"
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "取消"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "继续"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(选中全部)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "(选择了{count}个)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 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"
@@ -290,12 +290,12 @@ msgstr "已共享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "错误"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "共享时出错"
 
@@ -323,107 +323,116 @@ msgstr "分享给其他用户或组 ..."
 msgid "Share link"
 msgstr "分享链接"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "密码保护"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "密码"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "允许公开上传"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "发送链接到个人"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "发送"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "设置过期日期"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "过期日期"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "通过Email共享"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "未找到此人"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "组"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "不允许二次共享"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "在 {item} 与 {user} 共享。"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "取消共享"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "以邮件通知"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "可以修改"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "访问控制"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "创建"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "删除"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "共享"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "密码已受保护"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "取消设置过期日期时出错"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "设置过期日期时出错"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "正在发送..."
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "邮件已发送"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "警告"
 
@@ -479,7 +488,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}"
@@ -542,12 +551,12 @@ msgstr "重置密码"
 msgid ""
 "Mac OS X is not supported and %s will not work properly on this platform. "
 "Use it at your own risk! "
-msgstr ""
+msgstr "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！"
 
 #: setup/controller.php:144
 msgid ""
 "For the best results, please consider using a GNU/Linux server instead."
-msgstr ""
+msgstr "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。"
 
 #: strings.php:5
 msgid "Personal"
@@ -667,9 +676,13 @@ msgstr "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\"
 msgid "Create an <strong>admin account</strong>"
 msgstr "创建<strong>管理员账号</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "密码"
+
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "存储 & 数据库"
 
 #: templates/installation.php:77
 msgid "Data folder"
@@ -770,7 +783,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/zh_CN/files.po b/l10n/zh_CN/files.po
index 4e16a2a03c..865b80e949 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -5,14 +5,15 @@
 # Translators:
 # Martin Liu <liuzh66@gmail.com>, 2014
 # Mengz You <mengz.you@gmail.com>, 2013
+# Xuetian Weng <wengxt@gmail.com>, 2014
 # min zhang <zm1990s@gmail.com>, 2013
 # min zhang <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -31,27 +32,27 @@ msgstr "无法移动 %s - 同名文件已存在"
 msgid "Could not move %s"
 msgstr "无法移动 %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "文件名不能为空。"
 
 #: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "“%s” 是一个无效的文件名。"
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。"
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "目标文件夹已经被移动或删除。"
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -143,28 +144,32 @@ msgstr "上传失败。不能获取文件信息。"
 msgid "Invalid directory."
 msgstr "无效文件夹。"
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "文件"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "不能上传文件 {filename} ，由于它是一个目录或者为0字节"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "总文件大小 {size1} 超过上传限制 {size2}"
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "没有足够的可用空间，您正在上传 {size1} 的文件但是只有 {size2} 可用。"
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "上传已取消"
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "不能从服务器得到结果"
 
@@ -177,131 +182,135 @@ msgstr "文件正在上传中。现在离开此页会导致上传动作被取消
 msgid "URL cannot be empty"
 msgstr "URL不能为空"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "不能创建文件"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "不能创建文件夹"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr "获取URL出错"
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "分享"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "永久删除"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "移动文件错误"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "错误"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "等待"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr "移动文件出错。"
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "移动文件错误"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "错误"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "不能重命名文件"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr "删除文件出错。"
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "名称"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "大小"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "修改日期"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 文件夹"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n个文件"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} 和 {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "上传 %n 个文件"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "“{name}”是一个无效的文件名。"
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "您的存储空间已满，文件将无法更新或同步！"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "您的存储空间即将用完 ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。"
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "加密是被禁用的，但是您的文件还是被加密了。请到您的个人配置里设置文件加密选项。"
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
-msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} 和 {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "名称"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "大小"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "修改日期"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s 不能被重命名"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
-msgstr ""
+msgstr "上传 (最大 %s)"
 
 #: templates/admin.php:4
 msgid "File handling"
@@ -335,68 +344,75 @@ msgstr "ZIP 文件的最大输入大小"
 msgid "Save"
 msgstr "保存"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "新建"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr "创建文本文件"
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "文本文件"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "添加文件夹"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "文件夹"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "来自链接"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "已删除文件"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "取消上传"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr "您没有权限来上传湖州哦和创建文件"
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "这里还什么都没有。上传些东西吧！"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "删除"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "上传文件过大"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您正尝试上传的文件超过了此服务器可以上传的最大容量限制"
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "文件正在被扫描，请稍候。"
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "当前扫描"
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index bb2b1684ee..bbdc427b00 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Xuetian Weng <wengxt@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-09 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -17,6 +18,166 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "本地"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "地点"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr "Amazon S3"
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr "访问密钥"
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr "域名 (可选)"
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr "端口 (可选)"
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr "区域 (optional)"
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr "启用 SSL"
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "主机"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "用户名"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "密码"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr "根路径"
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr "安全 ftps://"
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "共享"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr "SMB / CIFS 使用 OC 登录信息"
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr "安全 https://"
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr "远程子文件夹"
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "权限已授予。"
@@ -39,31 +200,31 @@ msgstr "配置Google Drive存储时出错"
 
 #: js/settings.js:318 js/settings.js:325
 msgid "Saved"
-msgstr ""
+msgstr "已保存"
 
-#: lib/config.php:592
+#: lib/config.php:589
 msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>注意：</b>"
 
-#: lib/config.php:602
+#: lib/config.php:599
 msgid " and "
-msgstr ""
+msgstr "和"
 
-#: lib/config.php:624
+#: lib/config.php:621
 #, 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
+#: lib/config.php:623
 #, 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
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -92,7 +253,7 @@ msgstr "选项"
 
 #: templates/settings.php:12
 msgid "Available for"
-msgstr ""
+msgstr "可用于"
 
 #: templates/settings.php:32
 msgid "Add storage"
@@ -100,7 +261,7 @@ msgstr "添加存储"
 
 #: templates/settings.php:92
 msgid "No user or group"
-msgstr ""
+msgstr "无用户或组"
 
 #: templates/settings.php:95
 msgid "All Users"
@@ -125,7 +286,7 @@ msgstr "启用用户外部存储"
 
 #: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "允许用户挂载以下外部存储"
 
 #: templates/settings.php:150
 msgid "SSL root certificates"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 09d1b89e66..90533e3b86 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -5,13 +5,14 @@
 # Translators:
 # Martin Liu <liuzh66@gmail.com>, 2014
 # waterone <suiy02@gmail.com>, 2013
+# Xuetian Weng <wengxt@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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "由{owner}共享"
 
@@ -59,16 +60,15 @@ msgstr "共享已禁用"
 msgid "For more info, please ask the person who sent this link."
 msgstr "欲知详情，请联系发给你链接的人。"
 
-#: templates/public.php:17
-#, php-format
-msgid "shared by %s"
-msgstr "由 %s 共享"
+#: templates/public.php:21
+msgid "Download"
+msgstr "下载"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
-msgstr ""
+msgstr "下载 %s"
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr "直接链接"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 996e495d97..53e914c6cd 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "无法彻底删除文件%s"
 msgid "Couldn't restore %s"
 msgstr "无法恢复%s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "名称"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "恢复"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "错误"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "已恢复"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "这里没有东西. 你的回收站是空的!"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "名称"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "已删除"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "删除"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 47aa49ad55..ca08d11e2f 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -7,13 +7,13 @@
 # peishi fang <fangpeishi@gmail.com>, 2014
 # Martin Liu <liuzh66@gmail.com>, 2014
 # modokwang <modokwang@gmail.com>, 2013
-# Xuetian Weng <wengxt@gmail.com>, 2013
+# Xuetian Weng <wengxt@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +22,15 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
-msgstr ""
+msgstr "您正在访问来自不信任域名的服务器。"
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -35,11 +38,11 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "App “%s” 无法安装，因为它和当前 ownCloud 版本不兼容。"
 
 #: private/app.php:248
 msgid "No app name specified"
-msgstr ""
+msgstr "没有指定的 App 名称"
 
 #: private/app.php:353
 msgid "Help"
@@ -78,48 +81,48 @@ msgstr "无效的图像"
 msgid "web services under your control"
 msgstr "您控制的web服务"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP 下载已经关闭"
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "需要逐一下载文件"
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "回到文件"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "选择的文件太大，无法生成 zip 文件。"
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
-msgstr ""
+msgstr "请用较小的分块下载文件或者友好地询问您的管理员。"
 
 #: private/installer.php:64
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "安装 App 时未指定来源"
 
 #: private/installer.php:71
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "从 http 安装 App 时未指定链接"
 
 #: private/installer.php:76
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "从本地文件安装 App 时未指定路径"
 
 #: 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"
-msgstr ""
+msgstr "安装 App 是打开归档失败"
 
 #: private/installer.php:126
 msgid "App does not provide an info.xml file"
@@ -127,25 +130,25 @@ msgstr "应用未提供 info.xml 文件"
 
 #: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "App 无法安装，因为 App 中有非法代码 "
 
 #: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "App 无法安装，因为和当前 ownCloud 版本不兼容"
 
 #: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "App 无法安装，因为 App 包含不允许在非内置 App 中使用的 <shipped>true</shipped> 标签"
 
 #: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
-msgstr ""
+msgstr "App 无法安装因为 info.xml/version 中的版本和 App 商店版本不同"
 
 #: private/installer.php:170
 msgid "App directory already exists"
@@ -170,7 +173,7 @@ msgstr "Token 过期，请刷新页面。"
 
 #: private/json.php:74
 msgid "Unknown user"
-msgstr ""
+msgstr "未知用户"
 
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
@@ -212,7 +215,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
@@ -240,20 +243,20 @@ 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"
-msgstr ""
+msgstr "建议从 MySQL/MariaDB 数据库中删除此用户"
 
 #: private/setup/mysql.php:91
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL/MariaDB 用户 '%s'@'%%' 已存在"
 
 #: 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"
@@ -280,19 +283,19 @@ msgstr "请设置一个管理员用户名。"
 msgid "Set an admin password."
 msgstr "请设置一个管理员密码。"
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "请认真检查<a href='%s'>安装指南</a>."
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s 向您分享了 »%s«"
@@ -300,107 +303,113 @@ msgstr "%s 向您分享了 »%s«"
 #: private/share/share.php:498
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
+msgstr "共享 %s 失败，因为文件不存在。"
 
 #: private/share/share.php:523
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
-msgstr ""
+msgstr "共享 %s 失败，因为用户 %s 是对象的拥有者"
 
 #: private/share/share.php:529
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
-msgstr ""
+msgstr "共享 %s 失败，因为用户 %s 不存在"
 
 #: private/share/share.php:538
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
-msgstr ""
+msgstr "共享 %s 失败，因为用户 %s 不是 %s 所属的任何组的用户"
 
 #: private/share/share.php:551 private/share/share.php:579
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
-msgstr ""
+msgstr "共享 %s 失败，因为它已经共享给 %s"
 
 #: private/share/share.php:559
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
-msgstr ""
+msgstr "共享 %s 失败，因为 %s 组不存在"
 
 #: private/share/share.php:566
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr "共享 %s 失败，因为 %s 不是 %s 组的成员"
+
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
-msgstr ""
+msgstr "共享 %s 失败，因为不允许用链接共享"
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
-msgstr ""
+msgstr "%s 不是 %s 的合法共享类型"
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
-msgstr ""
+msgstr "设置 %s 权限失败，因为权限超出了 %s 已有权限。"
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
-msgstr ""
+msgstr "设置 %s 的权限失败，因为未找到到对应项"
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
-msgstr ""
+msgstr "共享后端 %s 必须实现 OCP\\Share_Backend 接口"
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
-msgstr ""
+msgstr "未找到共享后端 %s"
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
-msgstr ""
+msgstr "%s 的共享后端未找到"
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
-msgstr ""
+msgstr "共享 %s 失败，因为用户 %s 不是原始共享者"
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
-msgstr ""
+msgstr "共享 %s 失败，因为权限超过了 %s 已有权限"
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
-msgstr ""
+msgstr "共享 %s 失败，因为不允许二次共享"
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
-msgstr ""
+msgstr "共享 %s 失败，因为 %s 使用的共享后端未找到它的来源"
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
-msgstr ""
+msgstr "共享 %s 失败，因为未在文件缓存中找到文件。"
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "无法找到分类 \"%s\""
@@ -453,7 +462,7 @@ msgstr "年前"
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "用户名只允许使用以下字符：“a-z”，“A-Z”，“0-9”，和“_.@-”"
 
 #: private/user/manager.php:237
 msgid "A valid username must be provided"
@@ -465,4 +474,4 @@ msgstr "必须提供合法的密码"
 
 #: private/user/manager.php:246
 msgid "The username is already being used"
-msgstr ""
+msgstr "用户名已被使用"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 68e0386823..7a22358272 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -6,16 +6,16 @@
 # Martin Liu <liuzh66@gmail.com>, 2014
 # mozillazg <opensource.mozillazg@gmail.com>, 2014
 # m13253 <m13253@hotmail.com>, 2013
-# waterone <suiy02@gmail.com>, 2013
+# waterone <suiy02@gmail.com>, 2013-2014
 # modokwang <modokwang@gmail.com>, 2013
-# Xuetian Weng <wengxt@gmail.com>, 2013
+# Xuetian Weng <wengxt@gmail.com>, 2013-2014
 # min zhang <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,24 +27,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"
@@ -52,19 +52,19 @@ msgstr "邮件已发送"
 
 #: admin/controller.php:101
 msgid "You need to set your user email before being able to send test emails."
-msgstr ""
+msgstr "在发送测试邮件钱您需要设置您的用户电子邮件"
 
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
-msgstr ""
+msgstr "发送模式"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "加密"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
-msgstr ""
+msgstr "认证方法"
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
@@ -73,7 +73,7 @@ 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 "认证出错"
+msgstr "认证错误"
 
 #: ajax/changedisplayname.php:31
 msgid "Your full name has been changed."
@@ -93,16 +93,26 @@ msgstr "无法添加组"
 
 #: ajax/decryptall.php:31
 msgid "Files decrypted successfully"
-msgstr ""
+msgstr "文件解密成功"
 
 #: ajax/decryptall.php:33
 msgid ""
 "Couldn't decrypt your files, please check your owncloud.log or ask your "
 "administrator"
-msgstr ""
+msgstr "无法解密您的文件，请检查您的 owncloud.log 或询问管理员"
 
 #: ajax/decryptall.php:36
 msgid "Couldn't decrypt your files, check your password and try again"
+msgstr "无法解密您的文件，请检查密码并重试。"
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
 msgstr ""
 
 #: ajax/lostpassword.php:12
@@ -121,6 +131,16 @@ msgstr "无法删除组"
 msgid "Unable to delete user"
 msgstr "无法删除用户"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "语言已修改"
@@ -159,26 +179,26 @@ msgstr "没有满足的用户"
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
-msgstr ""
+msgstr "请提供管理员恢复密码，否则所有用户的数据都将遗失。"
 
 #: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
-msgstr ""
+msgstr "错误的管理员恢复密码。请检查密码并重试。"
 
 #: changepassword/controller.php:81
 msgid ""
 "Back-end doesn't support password change, but the users encryption key was "
 "successfully updated."
-msgstr ""
+msgstr "后端不支持修改密码，但是用户的加密密码已成功更新。"
 
 #: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "不能更改密码"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
-msgstr ""
+msgstr "正在发送..."
 
 #: js/apps.js:45 templates/help.php:4
 msgid "User Documentation"
@@ -186,7 +206,7 @@ msgstr "用户文档"
 
 #: js/apps.js:50
 msgid "Admin Documentation"
-msgstr ""
+msgstr "管理员文档"
 
 #: js/apps.js:67
 msgid "Update to {appversion}"
@@ -232,34 +252,42 @@ msgstr "更新"
 msgid "Updated"
 msgstr "已更新"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
-msgstr ""
+msgstr "选择头像"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
-msgstr ""
+msgstr "非常弱的密码"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
-msgstr ""
+msgstr "弱密码"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
-msgstr ""
+msgstr "一般强度的密码"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
-msgstr ""
+msgstr "较强的密码"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
-msgstr ""
+msgstr "强密码"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "正在解密文件... 请稍等，可能需要一些时间。"
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "已经删除"
@@ -305,7 +333,7 @@ msgstr "必须提供合法的密码"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "警告：用户 \"{user}\" 的家目录已存在"
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "简体中文"
 
@@ -339,19 +367,19 @@ msgstr "登录"
 
 #: templates/admin.php:18
 msgid "Plain"
-msgstr ""
+msgstr "Plain"
 
 #: templates/admin.php:19
 msgid "NT LAN Manager"
-msgstr ""
+msgstr "NT LAN 管理器"
 
 #: templates/admin.php:24
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: templates/admin.php:25
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
 #: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
@@ -362,7 +390,7 @@ msgstr "安全警告"
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
-msgstr ""
+msgstr "您正通过 HTTP 访问 %s。我们强烈建议您配置你的服务器来要求使用 HTTPS。"
 
 #: templates/admin.php:64
 msgid ""
@@ -407,7 +435,7 @@ msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
-msgstr ""
+msgstr "您的 PHP 版本已过期。强烈建议更新至 5.3.8 或者更新版本因为老版本存在已知问题。本次安装可能并未正常工作。"
 
 #: templates/admin.php:118
 msgid "Locale not working"
@@ -415,20 +443,20 @@ msgstr "本地化无法工作"
 
 #: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
-msgstr ""
+msgstr "系统语系无法设置为支持 UTF-8 的语系。"
 
 #: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
-msgstr ""
+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 ""
+msgstr "强烈建议在您的系统上安装需要的软件包来支持以下语系之一：%s。"
 
 #: templates/admin.php:143
 msgid "Internet connection not working"
@@ -450,18 +478,18 @@ msgstr "计划任务"
 #: templates/admin.php:167
 #, php-format
 msgid "Last cron was executed at %s."
-msgstr ""
+msgstr "上次定时任务执行于 %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 ""
+msgstr "上次定时任务执行于 %s。这是在一个小时之前执行的，可能出了什么问题。"
 
 #: templates/admin.php:174
 msgid "Cron was not executed yet!"
-msgstr ""
+msgstr "定时任务还未被执行！"
 
 #: templates/admin.php:184
 msgid "Execute one task with each page loaded"
@@ -471,7 +499,7 @@ msgstr "每个页面加载后执行一个任务"
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
-msgstr ""
+msgstr "cron.php 已注册于一个 webcron 服务来通过 http 每 15 分钟执行 cron.php。"
 
 #: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
@@ -493,148 +521,143 @@ msgstr "允许应用软件使用共享API"
 msgid "Allow links"
 msgstr "允许链接"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "允许用户使用连接公开共享项目"
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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:230
+msgid "Set default expiration date"
+msgstr "设置默认过期日期"
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr "过期于"
 
 #: templates/admin.php:235
+msgid "days"
+msgstr "天"
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr "强制过期日期"
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "允许用户使用连接公开共享项目"
+
+#: templates/admin.php:252
 msgid "Allow resharing"
 msgstr "允许再次共享"
 
-#: templates/admin.php:236
+#: templates/admin.php:253
 msgid "Allow users to share items shared with them again"
 msgstr "允许用户将共享给他们的项目再次共享"
 
-#: templates/admin.php:243
+#: templates/admin.php:260
 msgid "Allow users to share with anyone"
 msgstr "允许用户向任何人共享"
 
-#: templates/admin.php:246
+#: templates/admin.php:263
 msgid "Allow users to only share with users in their groups"
 msgstr "允许用户只向同组用户共享"
 
-#: templates/admin.php:253
+#: templates/admin.php:270
 msgid "Allow mail notification"
 msgstr "允许邮件通知"
 
-#: templates/admin.php:254
+#: templates/admin.php:271
 msgid "Allow users to send mail notification for shared files"
-msgstr ""
+msgstr "允许用户发送共享文件的邮件通知"
 
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
-
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Security"
 msgstr "安全"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "强制使用 HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "强制客户端通过加密连接连接到%s。"
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL."
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
-msgstr ""
+msgstr "电子邮件服务器"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
-msgstr ""
+msgstr "这被用于发送通知。"
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
-msgstr ""
+msgstr "来自地址"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
-msgstr ""
+msgstr "需要认证"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "服务器地址"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "端口"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "凭证"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
-msgstr ""
+msgstr "SMTP 用户名"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
-msgstr ""
-
-#: templates/admin.php:387
-msgid "Test email settings"
-msgstr ""
+msgstr "SMTP 密码"
 
 #: templates/admin.php:388
-msgid "Send email"
-msgstr ""
+msgid "Test email settings"
+msgstr "测试电子邮件设置"
 
-#: templates/admin.php:393
+#: templates/admin.php:389
+msgid "Send email"
+msgstr "发送邮件"
+
+#: templates/admin.php:394
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "日志级别"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "更少"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -658,7 +681,7 @@ msgstr "选择一个应用"
 
 #: templates/apps.php:43
 msgid "Documentation:"
-msgstr ""
+msgstr "文档："
 
 #: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
@@ -666,7 +689,7 @@ msgstr "查看在 app.owncloud.com 的应用程序页面"
 
 #: templates/apps.php:51
 msgid "See application website"
-msgstr ""
+msgstr "参见应用程序网站"
 
 #: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
@@ -745,7 +768,7 @@ msgstr "您的电子邮件"
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
-msgstr ""
+msgstr "填入电子邮件地址从而启用密码恢复和接收通知"
 
 #: templates/personal.php:89
 msgid "Profile picture"
@@ -765,7 +788,7 @@ msgstr "移除图片"
 
 #: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "png 或 jpg。正方形比较理想但你也可以之后对其进行裁剪。"
 
 #: templates/personal.php:100
 msgid "Your avatar is provided by your original account."
@@ -777,7 +800,7 @@ msgstr "取消"
 
 #: templates/personal.php:105
 msgid "Choose as profile image"
-msgstr ""
+msgstr "用作头像"
 
 #: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
@@ -787,29 +810,33 @@ msgstr "语言"
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
-msgstr ""
+msgstr "加密 app 不再被启用，请解密您所有的文件"
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "登录密码"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "解密所有文件"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "登录名称"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 882b10118b..e3b52a0757 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -88,63 +88,63 @@ msgstr "成功"
 msgid "Error"
 msgstr "错误"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "选择分组"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "连接测试成功"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "连接测试失败"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "您真的想要删除当前服务器配置吗？"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "确认删除"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 9a2ebdf31b..a80aadb768 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 17:30+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -58,79 +58,79 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "星期日"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "星期一"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "星期二"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "星期三"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "星期四"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "星期五"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "星期六"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "一月"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "二月"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "三月"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "四月"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "五月"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "六月"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "七月"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "八月"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "九月"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "十月"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "十一月"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "十二月"
 
@@ -186,74 +186,74 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Yes"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "OK"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr ""
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr ""
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr ""
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "取消"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr ""
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr ""
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr ""
 
@@ -285,12 +285,12 @@ msgstr "已分享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "錯誤"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "分享時發生錯誤"
 
@@ -318,107 +318,116 @@ msgstr ""
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "密碼保護"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "密碼"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "傳送"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "設定分享期限"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "分享期限"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "以電郵分享"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "找不到"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "取消分享"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr ""
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "新增"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "刪除"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "分享"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "密碼保護"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "傳送中"
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "郵件已傳"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr ""
 
@@ -662,6 +671,10 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "建立管理員帳戶"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "密碼"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index ebfecaaf0a..60b71ed44e 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 17:50+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr ""
 
@@ -36,18 +36,18 @@ msgstr ""
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -139,28 +139,32 @@ msgstr ""
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "文件"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr ""
 
@@ -173,128 +177,132 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "分享"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "錯誤"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "錯誤"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "名稱"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "大小"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "名稱"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "大小"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr ""
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -331,68 +339,75 @@ msgstr ""
 msgid "Save"
 msgstr "儲存"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "新文件夾"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index b277a7ae2d..b39136c282 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 17:40+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+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,6 +17,166 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "用戶名稱"
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "密碼"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "分享"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "網址"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
@@ -41,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:598
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:608
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:630
+#: lib/config.php:621
 #, 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:632
+#: lib/config.php:623
 #, 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:634
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index 2061b0b7dc..ee3a3adbb2 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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,7 +17,7 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr ""
 
@@ -57,16 +57,15 @@ msgstr ""
 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:21
+msgid "Download"
+msgstr "下載"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index 11f240157a..ab51b1e7d5 100644
--- a/l10n/zh_HK/files_trashbin.po
+++ b/l10n/zh_HK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -27,38 +27,34 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "名稱"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "錯誤"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "名稱"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "刪除"
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index 19ef614f59..62917587e2 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +17,15 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -73,23 +76,23 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -275,19 +278,19 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:202
+#: private/setup.php:164
 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
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
@@ -329,73 +332,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index c28ccb4879..e85a569b3e 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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "加密"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr ""
 
@@ -98,6 +98,16 @@ msgstr ""
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr ""
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr ""
 
@@ -225,34 +245,42 @@ msgstr "更新"
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr ""
 
@@ -486,148 +514,143 @@ msgstr ""
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:223
+msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "連接埠"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +803,33 @@ msgstr ""
 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
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr ""
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index df5884c6b2..c5dc3d39dd 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -86,43 +86,43 @@ msgstr "成功"
 msgid "Error"
 msgstr "錯誤"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -142,7 +142,7 @@ msgstr[0] ""
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:984
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 96984e4187..2090851003 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 12:53+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -60,79 +60,79 @@ msgstr "沒有臨時用的大頭貼，請再試一次"
 msgid "No crop data provided"
 msgstr "未設定剪裁"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "週日"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "週一"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "週二"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "週三"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "週四"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "週五"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "週六"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "一月"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "二月"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "三月"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "四月"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "五月"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "六月"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "七月"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "八月"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "九月"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "十月"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "十一月"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "十二月"
 
@@ -188,74 +188,74 @@ msgstr "去年"
 msgid "years ago"
 msgstr "幾年前"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "選擇"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "載入檔案選擇器樣板出錯： {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "是"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "否"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "選擇"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "載入檔案選擇器樣板出錯： {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "好"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "載入訊息樣板出錯： {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} 個檔案衝突"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "一個檔案衝突"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr "新檔案"
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "您要保留哪一個檔案？"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "如果您同時選擇兩個版本，被複製的那個檔案名稱後面會加上編號"
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "取消"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "繼續"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "（已全選）"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "（已選 {count} 項）"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "載入檔案存在樣板出錯"
 
@@ -287,12 +287,12 @@ msgstr "已分享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
 #: templates/installation.php:10
 msgid "Error"
 msgstr "錯誤"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:824
 msgid "Error while sharing"
 msgstr "分享時發生錯誤"
 
@@ -320,107 +320,116 @@ msgstr "與用戶或群組分享"
 msgid "Share link"
 msgstr "分享連結"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:233
 msgid "Password protect"
 msgstr "密碼保護"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "密碼"
+#: js/share.js:235
+msgid "Choose a password for the public link"
+msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "允許任何人上傳"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "將連結 email 給別人"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "寄出"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "指定到期日"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "到期日"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "透過電子郵件分享："
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "沒有找到任何人"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "群組"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "不允許重新分享"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "已和 {user} 分享 {item}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "取消分享"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "以 email 通知"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "可編輯"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "存取控制"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "建立"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "刪除"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "分享"
 
-#: js/share.js:721
+#: js/share.js:742
 msgid "Password protected"
 msgstr "受密碼保護"
 
-#: js/share.js:734
+#: js/share.js:761
 msgid "Error unsetting expiration date"
 msgstr "取消到期日設定失敗"
 
-#: js/share.js:752
+#: js/share.js:782
 msgid "Error setting expiration date"
 msgstr "設定到期日發生錯誤"
 
-#: js/share.js:777
+#: js/share.js:811
 msgid "Sending ..."
 msgstr "正在傳送…"
 
-#: js/share.js:788
+#: js/share.js:822
 msgid "Email sent"
 msgstr "Email 已寄出"
 
-#: js/share.js:812
+#: js/share.js:846
 msgid "Warning"
 msgstr "警告"
 
@@ -664,6 +673,10 @@ msgstr "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如
 msgid "Create an <strong>admin account</strong>"
 msgstr "建立一個<strong>管理者帳號</strong>"
 
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "密碼"
+
 #: templates/installation.php:70
 msgid "Storage & database"
 msgstr ""
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 507c1ce75d..1e5af0708c 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 14:36+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"
@@ -29,7 +29,7 @@ msgstr "無法移動 %s ，同名的檔案已經存在"
 msgid "Could not move %s"
 msgstr "無法移動 %s"
 
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
 msgstr "檔名不能為空"
 
@@ -38,18 +38,18 @@ msgstr "檔名不能為空"
 msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "檔名不合法，不允許 \\ / < > : \" | ? * 字元"
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -141,28 +141,32 @@ msgstr "上傳失敗，無法取得檔案資訊"
 msgid "Invalid directory."
 msgstr "無效的資料夾"
 
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
 msgstr "檔案"
 
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "因為 {filename} 是個目錄或是大小為零，所以無法上傳"
 
-#: js/file-upload.js:266
+#: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:276
+#: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/file-upload.js:353
+#: js/file-upload.js:358
 msgid "Upload cancelled."
 msgstr "上傳已取消"
 
-#: js/file-upload.js:398
+#: js/file-upload.js:404
 msgid "Could not get result from server."
 msgstr "無法從伺服器取回結果"
 
@@ -175,128 +179,132 @@ msgstr "檔案上傳中，離開此頁面將會取消上傳。"
 msgid "URL cannot be empty"
 msgstr "URL 不能留空"
 
-#: js/file-upload.js:559 js/filelist.js:597
+#: js/file-upload.js:559 js/filelist.js:1176
 msgid "{new_name} already exists"
 msgstr "{new_name} 已經存在"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:614
 msgid "Could not create file"
 msgstr "無法建立檔案"
 
-#: js/file-upload.js:624
+#: js/file-upload.js:630
 msgid "Could not create folder"
 msgstr "無法建立資料夾"
 
-#: js/file-upload.js:664
+#: js/file-upload.js:677
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:160
+#: js/fileactions.js:168
 msgid "Share"
 msgstr "分享"
 
-#: js/fileactions.js:173
+#: js/fileactions.js:181
 msgid "Delete permanently"
 msgstr "永久刪除"
 
-#: js/fileactions.js:234
+#: js/fileactions.js:221
 msgid "Rename"
 msgstr "重新命名"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error moving file"
-msgstr "移動檔案失敗"
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "正在準備您的下載，若您的檔案較大，將會需要更多時間。"
 
-#: js/filelist.js:102 js/files.js:550
-msgid "Error"
-msgstr "錯誤"
-
-#: js/filelist.js:258 js/filelist.js:1141
+#: js/filelist.js:602 js/filelist.js:1672
 msgid "Pending"
 msgstr "等候中"
 
-#: js/filelist.js:624
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr "移動檔案失敗"
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr "錯誤"
+
+#: js/filelist.js:1201
 msgid "Could not rename file"
 msgstr "無法重新命名"
 
-#: js/filelist.js:787
+#: js/filelist.js:1335
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:888 js/files.js:587
+#: js/filelist.js:1438 templates/list.php:62
+msgid "Name"
+msgstr "名稱"
+
+#: js/filelist.js:1439 templates/list.php:75
+msgid "Size"
+msgstr "大小"
+
+#: js/filelist.js:1440 templates/list.php:78
+msgid "Modified"
+msgstr "修改時間"
+
+#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 個資料夾"
 
-#: js/filelist.js:813 js/filelist.js:889 js/files.js:593
+#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n 個檔案"
 
-#: js/filelist.js:820
-msgid "{dirs} and {files}"
-msgstr "{dirs} 和 {files}"
-
-#: js/filelist.js:1049 js/filelist.js:1088
+#: js/filelist.js:1580 js/filelist.js:1619
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n 個檔案正在上傳"
 
-#: js/files.js:94
+#: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:115
+#: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "您的儲存空間已滿，沒有辦法再更新或是同步檔案！"
 
-#: js/files.js:119
+#: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "您的儲存空間快要滿了 ({usedSpacePercent}%)"
 
-#: js/files.js:132
+#: js/files.js:140
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次"
 
-#: js/files.js:136
+#: js/files.js:144
 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:140
+#: js/files.js:148
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "加密已經被停用，但是您的舊檔案還是處於已加密的狀態，請前往個人設定以解密這些檔案。"
 
-#: js/files.js:329
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
-msgstr "正在準備您的下載，若您的檔案較大，將會需要更多時間。"
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr "{dirs} 和 {files}"
 
-#: js/files.js:568 templates/index.php:67
-msgid "Name"
-msgstr "名稱"
-
-#: js/files.js:569 templates/index.php:79
-msgid "Size"
-msgstr "大小"
-
-#: js/files.js:570 templates/index.php:81
-msgid "Modified"
-msgstr "修改時間"
-
-#: lib/app.php:86
+#: lib/app.php:103
 #, php-format
 msgid "%s could not be renamed"
 msgstr "無法重新命名 %s"
 
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
@@ -333,68 +341,75 @@ msgstr "ZIP 壓縮前的原始大小限制"
 msgid "Save"
 msgstr "儲存"
 
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, 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/list.php:5
 msgid "New"
 msgstr "新增"
 
-#: templates/index.php:8
+#: templates/list.php:8
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/list.php:9
 msgid "Text file"
 msgstr "文字檔"
 
-#: templates/index.php:12
+#: templates/list.php:12
 msgid "New folder"
 msgstr "新資料夾"
 
-#: templates/index.php:13
+#: templates/list.php:13
 msgid "Folder"
 msgstr "資料夾"
 
-#: templates/index.php:16
+#: templates/list.php:16
 msgid "From link"
 msgstr "從連結"
 
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "回收桶"
-
-#: templates/index.php:45
+#: templates/list.php:42
 msgid "Cancel upload"
 msgstr "取消上傳"
 
-#: templates/index.php:51
+#: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
 msgstr "您沒有權限在這裡上傳或建立檔案"
 
-#: templates/index.php:56
+#: templates/list.php:53
 msgid "Nothing in here. Upload something!"
 msgstr "這裡還沒有東西，上傳一些吧！"
 
-#: templates/index.php:73
+#: templates/list.php:68
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/index.php:96
+#: templates/list.php:95
 msgid "Upload too large"
 msgstr "上傳過大"
 
-#: templates/index.php:98
+#: templates/list.php:97
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您試圖上傳的檔案大小超過伺服器的限制。"
 
-#: templates/index.php:103
+#: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "正在掃描檔案，請稍等。"
 
-#: templates/index.php:106
+#: templates/list.php:105
 msgid "Current scanning"
 msgstr "正在掃描"
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index 415b7d0fdf..4b4b1a3b14 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 12:53+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -18,6 +18,166 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: appinfo/app.php:34
+msgid "Local"
+msgstr "本地"
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr "地點"
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "主機"
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr "使用者名稱："
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr "密碼"
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr "分享"
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "允許存取"
@@ -42,29 +202,29 @@ msgstr "設定 Google Drive 儲存時發生錯誤"
 msgid "Saved"
 msgstr "已儲存"
 
-#: lib/config.php:598
+#: lib/config.php:589
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:608
+#: lib/config.php:599
 msgid " and "
 msgstr ""
 
-#: lib/config.php:630
+#: lib/config.php:621
 #, 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:632
+#: lib/config.php:623
 #, 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:634
+#: lib/config.php:625
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index d3707d7d70..fe02e39562 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: 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-05-11 01:55-0400\n"
+"PO-Revision-Date: 2014-05-11 05:02+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"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/share.js:13
+#: js/share.js:33
 msgid "Shared by {owner}"
 msgstr "由 {owner} 分享"
 
@@ -58,16 +58,15 @@ msgstr "分享功能已停用"
 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:21
+msgid "Download"
+msgstr "下載"
 
-#: templates/public.php:44
+#: templates/public.php:52
 #, php-format
 msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:48
+#: templates/public.php:56
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index be5b92f2b3..3e7ee1c770 100644
--- a/l10n/zh_TW/files_trashbin.po
+++ b/l10n/zh_TW/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -28,38 +28,34 @@ msgstr "無法永久刪除 %s"
 msgid "Couldn't restore %s"
 msgstr "無法還原 %s"
 
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
 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:19
-msgid "Name"
-msgstr "名稱"
-
-#: templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
 msgid "Restore"
 msgstr "還原"
 
-#: templates/index.php:30
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr "錯誤"
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr "已還原"
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "您的回收桶是空的！"
+
+#: templates/index.php:18
+msgid "Name"
+msgstr "名稱"
+
+#: templates/index.php:29
 msgid "Deleted"
 msgstr "已刪除"
 
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
 msgid "Delete"
 msgstr "刪除"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 5d7d0ffea2..f79fc17a08 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-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-25 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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,12 +19,15 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:723
+#: base.php:685
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:724
-msgid "Please contact your administrator"
+#: base.php:686
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
 msgstr ""
 
 #: private/app.php:236
@@ -75,23 +78,23 @@ msgstr "無效的圖片"
 msgid "web services under your control"
 msgstr "由您控制的網路服務"
 
-#: private/files.php:232
+#: private/files.php:235
 msgid "ZIP download is turned off."
 msgstr "ZIP 下載已關閉。"
 
-#: private/files.php:233
+#: private/files.php:236
 msgid "Files need to be downloaded one by one."
 msgstr "檔案需要逐一下載。"
 
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
 msgid "Back to Files"
 msgstr "回到檔案列表"
 
-#: private/files.php:259
+#: private/files.php:262
 msgid "Selected files too large to generate zip file."
 msgstr "選擇的檔案太大以致於無法產生壓縮檔。"
 
-#: private/files.php:260
+#: private/files.php:263
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
@@ -277,19 +280,19 @@ msgstr "設定管理員帳號。"
 msgid "Set an admin password."
 msgstr "設定管理員密碼。"
 
-#: private/setup.php:202
+#: private/setup.php:164
 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:203
+#: private/setup.php:165
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "請參考<a href='%s'>安裝指南</a>。"
 
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s 與您分享了 %s"
@@ -331,73 +334,79 @@ msgstr ""
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:629
+#: private/share/share.php:618
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:638
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:636
+#: private/share/share.php:645
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:773
+#: private/share/share.php:783
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:834
+#: private/share/share.php:844
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:940
+#: private/share/share.php:955
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:947
+#: private/share/share.php:962
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:953
+#: private/share/share.php:968
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1367
+#: private/share/share.php:1383
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1376
+#: private/share/share.php:1392
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1391
+#: private/share/share.php:1407
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1403
+#: private/share/share.php:1419
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1417
+#: private/share/share.php:1433
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:193
+#: private/tags.php:183
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "找不到分類：\"%s\""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index fc56c1dfb6..d320305a98 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/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-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+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"
@@ -49,15 +49,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:316
+#: admin/controller.php:116 templates/admin.php:317
 msgid "Send mode"
 msgstr "寄送模式"
 
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
 msgid "Encryption"
 msgstr "加密"
 
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:354
 msgid "Authentication method"
 msgstr "驗證方式"
 
@@ -100,6 +100,16 @@ msgstr "無法解密您的檔案，請檢查您的 owncloud.log 或是詢問您
 msgid "Couldn't decrypt your files, check your password and try again"
 msgstr "無法解密您的檔案，確認您的密碼並再重試一次"
 
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Email已儲存"
@@ -116,6 +126,16 @@ msgstr "群組刪除錯誤"
 msgid "Unable to delete user"
 msgstr "使用者刪除錯誤"
 
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
 #: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "語言已變更"
@@ -171,7 +191,7 @@ msgstr "後端不支援變更密碼，但成功更新使用者的加密金鑰"
 msgid "Unable to change password"
 msgstr "無法修改密碼"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "寄送中..."
 
@@ -227,34 +247,42 @@ msgstr "更新"
 msgid "Updated"
 msgstr "已更新"
 
-#: js/personal.js:243
+#: js/personal.js:256
 msgid "Select a profile picture"
 msgstr "選擇大頭貼"
 
-#: js/personal.js:274
+#: js/personal.js:287
 msgid "Very weak password"
 msgstr "非常弱的密碼"
 
-#: js/personal.js:275
+#: js/personal.js:288
 msgid "Weak password"
 msgstr "弱的密碼"
 
-#: js/personal.js:276
+#: js/personal.js:289
 msgid "So-so password"
 msgstr "普通的密碼"
 
-#: js/personal.js:277
+#: js/personal.js:290
 msgid "Good password"
 msgstr "好的密碼"
 
-#: js/personal.js:278
+#: js/personal.js:291
 msgid "Strong password"
 msgstr "很強的密碼"
 
-#: js/personal.js:313
+#: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "檔案解密中，請稍候。"
 
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
 #: js/users.js:47
 msgid "deleted"
 msgstr "已刪除"
@@ -300,7 +328,7 @@ msgstr "一定要提供一個有效的密碼"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "警告：使用者 {user} 的家目錄已經存在"
 
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -488,148 +516,143 @@ msgstr "允許 apps 使用分享 API"
 msgid "Allow links"
 msgstr "允許連結"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "允許使用者以結連公開分享檔案"
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:226
 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 users to send mail notification for shared files"
-msgstr "允許使用者寄送有關分享檔案的郵件通知"
-
-#: templates/admin.php:262
+#: templates/admin.php:230
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:232
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:266
+#: templates/admin.php:235
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:238
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr "允許使用者以結連公開分享檔案"
 
-#: templates/admin.php:278
+#: templates/admin.php:252
+msgid "Allow resharing"
+msgstr "允許轉貼分享"
+
+#: templates/admin.php:253
+msgid "Allow users to share items shared with them again"
+msgstr "允許使用者分享其他使用者分享給他的檔案"
+
+#: templates/admin.php:260
+msgid "Allow users to share with anyone"
+msgstr "允許使用者與任何人分享檔案"
+
+#: templates/admin.php:263
+msgid "Allow users to only share with users in their groups"
+msgstr "僅允許使用者在群組內分享"
+
+#: templates/admin.php:270
+msgid "Allow mail notification"
+msgstr "允許郵件通知"
+
+#: templates/admin.php:271
+msgid "Allow users to send mail notification for shared files"
+msgstr "允許使用者寄送有關分享檔案的郵件通知"
+
+#: templates/admin.php:279
 msgid "Security"
 msgstr "安全性"
 
-#: templates/admin.php:291
+#: templates/admin.php:292
 msgid "Enforce HTTPS"
 msgstr "強制啟用 HTTPS"
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "強迫用戶端使用加密連線連接到 %s"
 
-#: templates/admin.php:299
+#: templates/admin.php:300
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "請使用 HTTPS 連線到 %s 以啓用或停用強制 SSL 加密。"
 
-#: templates/admin.php:311
+#: templates/admin.php:312
 msgid "Email Server"
 msgstr "郵件伺服器"
 
-#: templates/admin.php:313
+#: templates/admin.php:314
 msgid "This is used for sending out notifications."
 msgstr "這是使用於寄送通知。"
 
-#: templates/admin.php:344
+#: templates/admin.php:345
 msgid "From address"
 msgstr "寄件地址"
 
-#: templates/admin.php:366
+#: templates/admin.php:367
 msgid "Authentication required"
 msgstr "必須驗證"
 
-#: templates/admin.php:370
+#: templates/admin.php:371
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: templates/admin.php:374
+#: templates/admin.php:375
 msgid "Port"
 msgstr "連接埠"
 
-#: templates/admin.php:379
+#: templates/admin.php:380
 msgid "Credentials"
 msgstr "認證"
 
-#: templates/admin.php:380
+#: templates/admin.php:381
 msgid "SMTP Username"
 msgstr "SMTP 帳號"
 
-#: templates/admin.php:383
+#: templates/admin.php:384
 msgid "SMTP Password"
 msgstr "SMTP 密碼"
 
-#: templates/admin.php:387
+#: templates/admin.php:388
 msgid "Test email settings"
 msgstr "測試郵件設定"
 
-#: templates/admin.php:388
+#: templates/admin.php:389
 msgid "Send email"
 msgstr "寄送郵件"
 
-#: templates/admin.php:393
+#: templates/admin.php:394
 msgid "Log"
 msgstr "紀錄"
 
-#: templates/admin.php:394
+#: templates/admin.php:395
 msgid "Log level"
 msgstr "紀錄層級"
 
-#: templates/admin.php:426
+#: templates/admin.php:427
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:427
+#: templates/admin.php:428
 msgid "Less"
 msgstr "更少"
 
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:434 templates/personal.php:196
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:438 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -782,29 +805,33 @@ msgstr "語言"
 msgid "Help translate"
 msgstr "幫助翻譯"
 
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: 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:151
+#: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "加密的軟體不能長時間啟用，請解密所有您的檔案"
 
-#: templates/personal.php:157
+#: templates/personal.php:156
 msgid "Log-in password"
 msgstr "登入密碼"
 
-#: templates/personal.php:162
+#: templates/personal.php:161
 msgid "Decrypt all Files"
 msgstr "解密所有檔案"
 
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
 #: templates/users.php:19
 msgid "Login Name"
 msgstr "登入名稱"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 8f3044f44d..a5257de820 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+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"
@@ -88,63 +88,63 @@ msgstr "成功"
 msgid "Error"
 msgstr "錯誤"
 
-#: js/settings.js:838
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr "選擇群組"
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr "連線測試成功"
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr "連線測試失敗"
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "您真的要刪除現在的伺服器設定嗎？"
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr "確認刪除"
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
diff --git a/lib/autoloader.php b/lib/autoloader.php
index 3451f799e1..2ce3638508 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -147,7 +147,7 @@ class Autoloader {
 	}
 
 	/**
-	 * @brief Sets the optional low-latency cache for class to path mapping.
+	 * Sets the optional low-latency cache for class to path mapping.
 	 * @param \OC\Memcache\Cache $memoryCache Instance of memory cache.
 	 */
 	public function setMemoryCache(\OC\Memcache\Cache $memoryCache = null) {
diff --git a/lib/base.php b/lib/base.php
index 0f55c1175c..abb76b94a5 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -175,7 +175,7 @@ class OC {
 			OC::$SERVERROOT . '/lib/private' . PATH_SEPARATOR .
 			OC::$SERVERROOT . '/config' . PATH_SEPARATOR .
 			OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR .
-			implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR .
+			implode(PATH_SEPARATOR, $paths) . PATH_SEPARATOR .
 			get_include_path() . PATH_SEPARATOR .
 			OC::$SERVERROOT
 		);
@@ -212,34 +212,6 @@ class OC {
 		}
 	}
 
-	/*
-	* This function adds some security related headers to all requests served via base.php
-	* The implementation of this function has to happen here to ensure that all third-party 
-	* components (e.g. SabreDAV) also benefit from this headers.
-	*/
-	public static function addSecurityHeaders() {
-		header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters
-		header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE
-
-		// iFrame Restriction Policy
-		$xFramePolicy = OC_Config::getValue('xframe_restriction', true);
-		if($xFramePolicy) {
-			header('X-Frame-Options: Sameorigin'); // Disallow iFraming from other domains
-		}
-
-		// Content Security Policy
-		// If you change the standard policy, please also change it in config.sample.php
-		$policy = OC_Config::getValue('custom_csp_policy',
-			'default-src \'self\'; '
-			.'script-src \'self\' \'unsafe-eval\'; '
-			.'style-src \'self\' \'unsafe-inline\'; '
-			.'frame-src *; '
-			.'img-src *; '
-			.'font-src \'self\' data:; '
-			.'media-src *');
-		header('Content-Security-Policy:'.$policy);
-	}
-
 	public static function checkSSL() {
 		// redirect to https site if configured
 		if (OC_Config::getValue("forcessl", false)) {
@@ -378,9 +350,17 @@ class OC {
 		//set the session object to a dummy session so code relying on the session existing still works
 		self::$session = new \OC\Session\Memory('');
 
+		// Let the session name be changed in the initSession Hook
+		$sessionName = OC_Util::getInstanceId();
+
 		try {
-			// set the session name to the instance id - which is unique
-			self::$session = new \OC\Session\Internal(OC_Util::getInstanceId());
+			// Allow session apps to create a custom session object
+			$useCustomSession = false;
+			OC_Hook::emit('OC', 'initSession', array('session' => &self::$session, 'sessionName' => &$sessionName, 'useCustomSession' => &$useCustomSession));
+			if(!$useCustomSession) {
+				// set the session name to the instance id - which is unique
+				self::$session = new \OC\Session\Internal($sessionName);
+			}
 			// if session cant be started break with http 500 error
 		} catch (Exception $e) {
 			//show the user a detailed error page
@@ -436,6 +416,7 @@ class OC {
 		self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing');
 		self::$loader->registerPrefix('Symfony\\Component\\Console', 'symfony/console');
 		self::$loader->registerPrefix('Patchwork', '3rdparty');
+		self::$loader->registerPrefix('Pimple', '3rdparty/Pimple');
 		spl_autoload_register(array(self::$loader, 'load'));
 
 		// set some stuff
@@ -536,6 +517,7 @@ class OC {
 		self::$server = new \OC\Server();
 
 		self::initTemplateEngine();
+		OC_App::loadApps(array('session'));
 		if (!self::$CLI) {
 			self::initSession();
 		} else {
@@ -544,7 +526,7 @@ class OC {
 		self::checkConfig();
 		self::checkInstalled();
 		self::checkSSL();
-		self::addSecurityHeaders();
+		OC_Response::addSecurityHeaders();
 
 		$errors = OC_Util::checkServer();
 		if (count($errors) > 0) {
@@ -572,17 +554,6 @@ class OC {
 		OC_User::useBackend(new OC_User_Database());
 		OC_Group::useBackend(new OC_Group_Database());
 
-		$basic_auth = OC_Config::getValue('basic_auth', true);
-		if ($basic_auth && isset($_SERVER['PHP_AUTH_USER']) && self::$session->exists('loginname')
-			&& $_SERVER['PHP_AUTH_USER'] !== self::$session->get('loginname')) {
-			$sessionUser = self::$session->get('loginname');
-			$serverUser = $_SERVER['PHP_AUTH_USER'];
-			OC_Log::write('core',
-				"Session loginname ($sessionUser) doesn't match SERVER[PHP_AUTH_USER] ($serverUser).",
-				OC_Log::WARN);
-			OC_User::logout();
-		}
-
 		// Load minimum set of apps - which is filesystem, authentication and logging
 		if (!self::checkUpgrade(false)) {
 			OC_App::loadApps(array('authentication'));
@@ -623,7 +594,7 @@ class OC {
 		if (!is_null(self::$REQUESTEDFILE)) {
 			$subdir = OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . self::$REQUESTEDFILE;
 			$parent = OC_App::getAppPath(OC::$REQUESTEDAPP);
-			if (!OC_Helper::issubdirectory($subdir, $parent)) {
+			if (!OC_Helper::isSubDirectory($subdir, $parent)) {
 				self::$REQUESTEDFILE = null;
 				header('HTTP/1.0 404 Not Found');
 				exit;
@@ -695,7 +666,7 @@ class OC {
 	}
 
 	/**
-	 * @brief Handle the request
+	 * Handle the request
 	 */
 	public static function handleRequest() {
 		$l = \OC_L10N::get('lib');
@@ -721,7 +692,7 @@ class OC {
 			header('Status: 400 Bad Request');
 			OC_Template::printErrorPage(
 				$l->t('You are accessing the server from an untrusted domain.'),
-				$l->t('Please contact your administrator')
+				$l->t('Please contact your administrator. If you are an administrator of this instance, configure the "trusted_domain" setting in config/config.php. An example configuration is provided in config/config.sample.php.')
 			);
 			return;
 		}
@@ -732,8 +703,10 @@ class OC {
 			self::checkUpgrade();
 		}
 
-		// Test it the user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
-		OC::tryBasicAuthLogin();
+		if (!OC_User::isLoggedIn()) {
+			// Test it the user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
+			OC::tryBasicAuthLogin();
+		}
 
 		if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) {
 			try {
@@ -784,6 +757,15 @@ class OC {
 				if (isset($_COOKIE['oc_token'])) {
 					OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']);
 				}
+				if (isset($_SERVER['PHP_AUTH_USER'])) {
+					if (isset($_COOKIE['oc_ignore_php_auth_user'])) {
+						// Ignore HTTP Authentication for 5 more mintues.
+						setcookie('oc_ignore_php_auth_user', $_SERVER['PHP_AUTH_USER'], time() + 300, OC::$WEBROOT.(empty(OC::$WEBROOT) ? '/' : ''));
+					} elseif ($_SERVER['PHP_AUTH_USER'] === self::$session->get('loginname')) {
+						// Ignore HTTP Authentication to allow a different user to log in.
+						setcookie('oc_ignore_php_auth_user', $_SERVER['PHP_AUTH_USER'], 0, OC::$WEBROOT.(empty(OC::$WEBROOT) ? '/' : ''));
+					}
+				}
 				OC_User::logout();
 				// redirect to webroot and add slash if webroot is empty
 				header("Location: " . OC::$WEBROOT.(empty(OC::$WEBROOT) ? '/' : ''));
@@ -974,6 +956,7 @@ class OC {
 	protected static function tryBasicAuthLogin() {
 		if (!isset($_SERVER["PHP_AUTH_USER"])
 			|| !isset($_SERVER["PHP_AUTH_PW"])
+			|| (isset($_COOKIE['oc_ignore_php_auth_user']) && $_COOKIE['oc_ignore_php_auth_user'] === $_SERVER['PHP_AUTH_USER'])
 		) {
 			return false;
 		}
diff --git a/lib/l10n/af_ZA.php b/lib/l10n/af_ZA.php
index 566694d1fd..34d750ab65 100644
--- a/lib/l10n/af_ZA.php
+++ b/lib/l10n/af_ZA.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Onbekende leertipe",
 "web services under your control" => "webdienste onder jou beheer",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
+"_%n hour ago_::_%n hours ago_" => array("","%n ure gelede"),
+"_%n day go_::_%n days ago_" => array("","%n dae gelede"),
+"_%n month ago_::_%n months ago_" => array("","%n maande gelede")
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ast.php b/lib/l10n/ast.php
index 93a20beb5d..4eaf734931 100644
--- a/lib/l10n/ast.php
+++ b/lib/l10n/ast.php
@@ -1,16 +1,19 @@
 <?php
 $TRANSLATIONS = array(
+"Help" => "Ayuda",
 "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",
+"Authentication error" => "Fallu d'autenticación",
 "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",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El sirvidor web entá nun ta configurado pa permitir la sincronización de ficheros yá que la interface WebDAV paez nun tar funcionando.",
 "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"),
@@ -21,6 +24,8 @@ $TRANSLATIONS = array(
 "last month" => "mes caberu",
 "_%n month ago_::_%n months ago_" => array("","fai %n meses"),
 "last year" => "añu caberu",
-"years ago" => "fai años"
+"years ago" => "fai años",
+"A valid username must be provided" => "Tien d'apurrise un nome d'usuariu válidu",
+"A valid password must be provided" => "Tien d'apurrise una contraseña válida"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index 0d80c7fe4f..94d0fbe069 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
-"Please contact your administrator" => "Kontaktujte prosím vašeho správce systému.",
+"You are accessing the server from an untrusted domain." => "Přistupujete na server z nedůvěryhodné domény.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Kontaktujte prosím správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. Příklad konfigurace najdete v souboru config/config.sample.php.",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikace \"%s\" nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud.",
 "No app name specified" => "Nebyl zadan název aplikace",
 "Help" => "Nápověda",
@@ -61,10 +62,12 @@ $TRANSLATIONS = array(
 "Sharing %s failed, because the user %s is the item owner" => "Sdílení položky %s selhalo, protože uživatel %s je jejím vlastníkem",
 "Sharing %s failed, because the user %s does not exist" => "Sdílení položky %s selhalo, protože uživatel %s neexistuje",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Sdílení položky %s selhalo, protože uživatel %s není členem žádné skupiny společné s uživatelem %s",
-"Sharing %s failed, because this item is already shared with %s" => "Sdílení položky %s selhalo, protože položka již je s uživatelem %s sdílená",
+"Sharing %s failed, because this item is already shared with %s" => "Sdílení položky %s selhalo, protože položka již je s uživatelem %s sdílena",
 "Sharing %s failed, because the group %s does not exist" => "Sdílení položky %s selhalo, protože skupina %s neexistuje",
 "Sharing %s failed, because %s is not a member of the group %s" => "Sdílení položky %s selhalo, protože uživatel %s není členem skupiny %s",
 "Sharing %s failed, because sharing with links is not allowed" => "Sdílení položky %s selhalo, protože sdílení pomocí linků není povoleno",
+"Share type %s is not valid for %s" => "Sdílení typu %s není korektní pro %s",
+"Setting permissions for %s failed, because the item was not found" => "Nastavení práv pro %s selhalo, protože položka nebyla nalezena",
 "Could not find category \"%s\"" => "Nelze nalézt kategorii \"%s\"",
 "seconds ago" => "před pár sekundami",
 "_%n minute ago_::_%n minutes ago_" => array("před %n minutou","před %n minutami","před %n minutami"),
@@ -76,7 +79,7 @@ $TRANSLATIONS = array(
 "_%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",
-"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Pouze následující znaky jsou povoleny v uživatelském jménu: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Pouze následující znaky jsou povoleny v uživatelském jménu: \"a-z\", \"A-Z\", \"0-9\" a \"_.@-\"",
 "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"
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 9a334a6ccc..63e3aefb8e 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"You are accessing the server from an untrusted domain." => "Du greifst von einer nicht vertrauenswürdigen Domain auf den Server zu.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Bitte kontaktiere Deinen Administrator. Wenn du aktuell Administrator dieser Instanz bist, konfiguriere bitte die \"trusted_domain\" - Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereit gestellt.",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist.",
 "No app name specified" => "Es wurde kein Applikation-Name angegeben",
 "Help" => "Hilfe",
@@ -56,12 +58,14 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
 "Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
 "%s shared »%s« with you" => "%s teilte »%s« mit Dir",
+"Sharing %s failed, because the file does not exist" => "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
 "Sharing %s failed, because the user %s is the item owner" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist",
 "Sharing %s failed, because the user %s does not exist" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s nicht existiert",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s kein Gruppenmitglied einer der Gruppen von %s ist",
 "Sharing %s failed, because this item is already shared with %s" => "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird",
 "Sharing %s failed, because the group %s does not exist" => "Freigabe von %s fehlgeschlagen, da die Gruppe %s nicht existiert",
 "Sharing %s failed, because %s is not a member of the group %s" => "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist",
+"You need to provide a password to create a public link, only protected links are allowed" => "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren",
 "Sharing %s failed, because sharing with links is not allowed" => "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist",
 "Share type %s is not valid for %s" => "Freigabetyp %s ist nicht gültig für %s",
 "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index ae71118979..e963bb2aa6 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"You are accessing the server from an untrusted domain." => "Sie greifen von einer nicht vertrauenswürdigen Domain auf den Server zu.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Bitte kontaktieren Sie Ihren Administrator. Wenn Sie aktuell Administrator dieser Instanz sind, konfigurieren Sie bitte die \"trusted_domain\" - Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereit gestellt.",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist.",
 "No app name specified" => "Es wurde kein Applikation-Name angegeben",
 "Help" => "Hilfe",
@@ -56,12 +58,14 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
 "Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
 "%s shared »%s« with you" => "%s hat »%s« mit Ihnen geteilt",
+"Sharing %s failed, because the file does not exist" => "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
 "Sharing %s failed, because the user %s is the item owner" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist",
 "Sharing %s failed, because the user %s does not exist" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s nicht existiert",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s kein Gruppenmitglied einer der Gruppen von %s ist",
 "Sharing %s failed, because this item is already shared with %s" => "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird",
 "Sharing %s failed, because the group %s does not exist" => "Freigabe von %s fehlgeschlagen, da die Gruppe %s nicht existiert",
 "Sharing %s failed, because %s is not a member of the group %s" => "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist",
+"You need to provide a password to create a public link, only protected links are allowed" => "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren",
 "Sharing %s failed, because sharing with links is not allowed" => "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist",
 "Share type %s is not valid for %s" => "Freigabetyp %s ist nicht gültig für %s",
 "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten",
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 109104e406..716b2694d4 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"You are accessing the server from an untrusted domain." => "Η προσπέλαση του διακομιστή γίνεται από μη έμπιστο τομέα.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Παρακαλώ επικοινωνήστε με τον διαχειριστή συστημάτων σας. Αν είστε διαχειριστής αυτού του στιγμιοτύπο, ρυθμίστε το κλειδί \"trusted_domain\" στο αρχείο config/config.php. Ένα παράδειγμα παρέχεται στο αρχείο config/config.sample.php.",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Η εφαρμογή \"%s\" δεν μπορεί να εγκατασταθεί επειδή δεν είναι συμβατή με αυτή την έκδοση του ownCloud.",
 "No app name specified" => "Δεν προδιορίστηκε όνομα εφαρμογής",
 "Help" => "Βοήθεια",
@@ -56,6 +58,25 @@ $TRANSLATIONS = array(
 "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«",
+"Sharing %s failed, because the file does not exist" => "Ο διαμοιρασμός του %s απέτυχε, γιατί το αρχείο δεν υπάρχει",
+"Sharing %s failed, because the user %s is the item owner" => "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s είναι ο ιδιοκτήτης του αντικειμένου",
+"Sharing %s failed, because the user %s does not exist" => "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν υπάρχει",
+"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν είναι μέλος καμίας ομάδας στην οποία ο χρήστης %s είναι μέλος",
+"Sharing %s failed, because this item is already shared with %s" => "Ο διαμοιρασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοιρασμένο ήδη με τον χρήστη %s",
+"Sharing %s failed, because the group %s does not exist" => "Ο διαμοιρασμός του %s απέτυχε, γιατί η ομάδα χρηστών %s δεν υπάρχει",
+"Sharing %s failed, because %s is not a member of the group %s" => "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν είναι μέλος της ομάδας %s",
+"Sharing %s failed, because sharing with links is not allowed" => "Ο διαμοιρασμός του %s απέτυχε, γιατί δεν επιτρέπεται ο διαμοιρασμός με συνδέσμους",
+"Share type %s is not valid for %s" => "Ο τύπος διαμοιρασμού %s δεν είναι έγκυρος για το %s",
+"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Ο ορισμός δικαιωμάτων για το %s απέτυχε, γιατί τα δικαιώματα υπερτερούν αυτά που είναι ορισμένα για το %s",
+"Setting permissions for %s failed, because the item was not found" => "Ο ορισμός δικαιωμάτων για το %s απέτυχε, γιατί το αντικείμενο δεν βρέθηκε",
+"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Το σύστημα διαμοιρασμού %s πρέπει να υλοποιεί την διεπαφή OCP\\Share_Backend",
+"Sharing backend %s not found" => "Το σύστημα διαμοιρασμού %s δεν βρέθηκε",
+"Sharing backend for %s not found" => "Το σύστημα διαμοιρασμού για το %s δεν βρέθηκε",
+"Sharing %s failed, because the user %s is the original sharer" => "Ο διαμοιρασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοιρασμένο αρχικά από τον χρήστη %s",
+"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Ο διαμοιρασμός του %s απέτυχε, γιατί τα δικαιώματα υπερτερούν αυτά που είναι ορισμένα για το %s",
+"Sharing %s failed, because resharing is not allowed" => "Ο διαμοιρασμός του %s απέτυχε, γιατί δεν επιτρέπεται ο επαναδιαμοιρασμός",
+"Sharing %s failed, because the sharing backend for %s could not find its source" => "Ο διαμοιρασμός του %s απέτυχε, γιατί δεν ήταν δυνατό να εντοπίσει την πηγή το σύστημα διαμοιρασμού για το %s ",
+"Sharing %s failed, because the file could not be found in the file cache" => "Ο διαμοιρασμός του %s απέτυχε, γιατί το αρχείο δεν βρέθηκε στην προσωρινή αποθήκευση αρχείων",
 "Could not find category \"%s\"" => "Αδυναμία εύρεσης κατηγορίας \"%s\"",
 "seconds ago" => "δευτερόλεπτα πριν",
 "_%n minute ago_::_%n minutes ago_" => array("","%n λεπτά πριν"),
@@ -67,7 +88,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","%n μήνες πριν"),
 "last year" => "τελευταίο χρόνο",
 "years ago" => "χρόνια πριν",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Μόνο οι παρακάτων χαρακτήρες επιτρέπονται σε ένα όνομα χρήστη: \"a-z\", \"A-Z\", \"0-9\" και \"_.@-\"",
 "A valid username must be provided" => "Πρέπει να δοθεί έγκυρο όνομα χρήστη",
-"A valid password must be provided" => "Πρέπει να δοθεί έγκυρο συνθηματικό"
+"A valid password must be provided" => "Πρέπει να δοθεί έγκυρο συνθηματικό",
+"The username is already being used" => "Το όνομα χρήστη είναι κατειλημμένο"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php
index 9bdf84750b..30245d1dd4 100644
--- a/lib/l10n/en_GB.php
+++ b/lib/l10n/en_GB.php
@@ -1,7 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "You are accessing the server from an untrusted domain." => "You are accessing the server from an untrusted domain.",
-"Please contact your administrator" => "Please contact your administrator",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php.",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "App \"%s\" can't be installed because it is not compatible with this version of ownCloud.",
 "No app name specified" => "No app name specified",
 "Help" => "Help",
diff --git a/lib/l10n/en_NZ.php b/lib/l10n/en_NZ.php
new file mode 100644
index 0000000000..15f78e0bce
--- /dev/null
+++ b/lib/l10n/en_NZ.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/es.php b/lib/l10n/es.php
index 60d429b8a8..c3484ad9de 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -1,7 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "You are accessing the server from an untrusted domain." => "Está accediendo al servidor desde un dominio inseguro.",
-"Please contact your administrator" => "Contacte a su administrador",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Contacte a su administrador. Si usted es el administrador, configure \"trusted_domain\" en config/config.php. En config/config.sample.php se encuentra un ejemplo para la configuración.",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud",
 "No app name specified" => "No se ha especificado nombre de la aplicación",
 "Help" => "Ayuda",
@@ -65,13 +65,18 @@ $TRANSLATIONS = array(
 "Sharing %s failed, because this item is already shared with %s" => "Compartiendo %s ha fallado, ya que este elemento ya está compartido con %s",
 "Sharing %s failed, because the group %s does not exist" => "Compartiendo %s ha fallado, ya que el grupo %s no existe",
 "Sharing %s failed, because %s is not a member of the group %s" => "Compartiendo %s ha fallado, ya que %s no es miembro del grupo %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Es necesario definir una contraseña para crear un enlace publico. Solo los enlaces protegidos están permitidos",
 "Sharing %s failed, because sharing with links is not allowed" => "Compartiendo %s ha fallado, ya que compartir con enlaces no está permitido",
 "Share type %s is not valid for %s" => "Compartir tipo %s no es válido para %s",
 "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Configuración de permisos para %s ha fallado, ya que los permisos superan los permisos dados a %s",
 "Setting permissions for %s failed, because the item was not found" => "Configuración de permisos para %s ha fallado, ya que el elemento no fue encontrado",
+"Sharing backend %s must implement the interface OCP\\Share_Backend" => "El motor compartido %s debe implementar la interfaz OCP\\Share_Backend",
+"Sharing backend %s not found" => "El motor compartido %s no se ha encontrado",
+"Sharing backend for %s not found" => "Motor compartido para %s no encontrado",
 "Sharing %s failed, because the user %s is the original sharer" => "Compartiendo %s ha fallado, ya que el usuario %s es el compartidor original",
 "Sharing %s failed, because the permissions exceed permissions granted to %s" => "Compartiendo %s ha fallado, ya que los permisos superan los permisos otorgados a %s",
 "Sharing %s failed, because resharing is not allowed" => "Compartiendo %s ha fallado, ya que volver a compartir no está permitido",
+"Sharing %s failed, because the sharing backend for %s could not find its source" => "Compartir %s falló porque el motor compartido para %s podría no encontrar su origen",
 "Sharing %s failed, because the file could not be found in the file cache" => "Compartiendo %s ha fallado, ya que el archivo no pudo ser encontrado en el cache de archivo",
 "Could not find category \"%s\"" => "No puede encontrar la categoria \"%s\"",
 "seconds ago" => "hace segundos",
diff --git a/lib/l10n/es_BO.php b/lib/l10n/es_BO.php
new file mode 100644
index 0000000000..15f78e0bce
--- /dev/null
+++ b/lib/l10n/es_BO.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/es_CO.php b/lib/l10n/es_CO.php
new file mode 100644
index 0000000000..15f78e0bce
--- /dev/null
+++ b/lib/l10n/es_CO.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/es_EC.php b/lib/l10n/es_EC.php
new file mode 100644
index 0000000000..15f78e0bce
--- /dev/null
+++ b/lib/l10n/es_EC.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/es_PE.php b/lib/l10n/es_PE.php
new file mode 100644
index 0000000000..15f78e0bce
--- /dev/null
+++ b/lib/l10n/es_PE.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/es_UY.php b/lib/l10n/es_UY.php
new file mode 100644
index 0000000000..15f78e0bce
--- /dev/null
+++ b/lib/l10n/es_UY.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/et_EE.php b/lib/l10n/et_EE.php
index 9ad40ff572..079ff3ba47 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "You are accessing the server from an untrusted domain." => "Sa kasutad serverit usalduseta asukohast",
-"Please contact your administrator" => "Palun kontakteeru oma süsteemihalduriga",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Rakendit \"%s\" ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga.",
 "No app name specified" => "Ühegi rakendi nime pole määratletud",
 "Help" => "Abiinfo",
diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php
index c1c16cf94b..11912269ba 100644
--- a/lib/l10n/fa.php
+++ b/lib/l10n/fa.php
@@ -5,6 +5,8 @@ $TRANSLATIONS = array(
 "Settings" => "تنظیمات",
 "Users" => "کاربران",
 "Admin" => "مدیر",
+"Unknown filetype" => "نوع فایل ناشناخته",
+"Invalid image" => "عکس نامعتبر",
 "web services under your control" => "سرویس های تحت وب در کنترل شما",
 "ZIP download is turned off." => "دانلود به صورت فشرده غیر فعال است",
 "Files need to be downloaded one by one." => "فایل ها باید به صورت یکی یکی دانلود شوند",
@@ -34,13 +36,13 @@ $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s به اشتراک گذاشته شده است »%s« توسط شما",
 "Could not find category \"%s\"" => "دسته بندی %s یافت نشد",
 "seconds ago" => "ثانیه‌ها پیش",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n minute ago_::_%n minutes ago_" => array("%n دقیقه قبل"),
+"_%n hour ago_::_%n hours ago_" => array("%n ساعت قبل"),
 "today" => "امروز",
 "yesterday" => "دیروز",
-"_%n day go_::_%n days ago_" => array(""),
+"_%n day go_::_%n days ago_" => array("%n روز قبل"),
 "last month" => "ماه قبل",
-"_%n month ago_::_%n months ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("%n ماه قبل"),
 "last year" => "سال قبل",
 "years ago" => "سال‌های قبل",
 "A valid username must be provided" => "نام کاربری صحیح باید وارد شود",
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 8396cf1438..e87c703880 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -53,6 +53,7 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web-palvelimen asetukset eivät ole kelvolliset tiedostojen synkronointia varten, koska WebDAV-liitäntä vaikuttaa olevan rikki.",
 "Please double check the <a href='%s'>installation guides</a>." => "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
 "%s shared »%s« with you" => "%s jakoi kohteen »%s« kanssasi",
+"Sharing %s failed, because the file does not exist" => "Kohteen %s jakaminen epäonnistui, koska tiedostoa ei ole olemassa",
 "Sharing %s failed, because the user %s is the item owner" => "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s on kohteen omistaja",
 "Sharing %s failed, because the user %s does not exist" => "Kohteen %s jakaminen epäonnistui, koska käyttäjää %s ei ole olemassa",
 "Sharing %s failed, because this item is already shared with %s" => "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjän %s kanssa",
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index e7d249add9..3bfa3fe891 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "You are accessing the server from an untrusted domain." => "Vous accédez au serveur à partir d'un domaine non-approuvé.",
-"Please contact your administrator" => "Veuillez contacter votre administrateur",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "L'application \"%s\" ne peut être installée car elle n'est pas compatible avec cette version de ownCloud.",
 "No app name specified" => "Aucun nom d'application spécifié",
 "Help" => "Aide",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 291e2c5d51..c4b74f9fde 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -1,7 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "You are accessing the server from an untrusted domain." => "Esta accedendo desde un dominio non fiábel.",
-"Please contact your administrator" => "Contacte co administrador",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Póñase en contacto co administrador. Se vostede é administrador desta instancia, configure o parámetro «trusted_domain» en config/config.php. Dispón dun exemplo de configuración en config/config.sample.php.",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Non é posíbel instalar o aplicativo «%s» por non seren compatíbel  con esta versión do ownCloud.",
 "No app name specified" => "Non se especificou o nome do aplicativo",
 "Help" => "Axuda",
@@ -65,6 +65,7 @@ $TRANSLATIONS = array(
 "Sharing %s failed, because this item is already shared with %s" => "Fallou a compartición de %s, este elemento xa está compartido con %s",
 "Sharing %s failed, because the group %s does not exist" => "Fallou a compartición de %s, o grupo %s non existe",
 "Sharing %s failed, because %s is not a member of the group %s" => "Fallou a compartición de %s, %s non é membro do grupo %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Ten que fornecer un contrasinal para a ligazón pública, só se permiten ligazóns protexidas",
 "Sharing %s failed, because sharing with links is not allowed" => "Fallou a compartición de %s, non está permitido compartir con ligazóns",
 "Share type %s is not valid for %s" => "Non se admite a compartición do tipo %s para %s",
 "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Non é posíbel estabelecer permisos para %s, os permisos superan os permisos concedidos a %s",
diff --git a/lib/l10n/hi_IN.php b/lib/l10n/hi_IN.php
new file mode 100644
index 0000000000..15f78e0bce
--- /dev/null
+++ b/lib/l10n/hi_IN.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index af66c7d8f4..b6b5f00d97 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -1,7 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "You are accessing the server from an untrusted domain." => "Stai accedendo al server da un dominio non affidabile.",
-"Please contact your administrator" => "Contatta il tuo amministratore",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Contatta il tuo amministratore di sistema. Se sei un amministratore, configura l'impostazione \"trusted_domain\" in config/config.php. Un esempio di configurazione è disponibile in config/config.sample.php.",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "L'applicazione \"%s\" non può essere installata poiché non è compatibile con questa versione di ownCloud.",
 "No app name specified" => "Il nome dell'applicazione non è specificato",
 "Help" => "Aiuto",
@@ -65,6 +65,7 @@ $TRANSLATIONS = array(
 "Sharing %s failed, because this item is already shared with %s" => "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con %s",
 "Sharing %s failed, because the group %s does not exist" => "Condivisione di %s non riuscita, poiché il gruppo %s non esiste",
 "Sharing %s failed, because %s is not a member of the group %s" => "Condivisione di %s non riuscita, poiché %s non appartiene al gruppo %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Devi fornire una password per creare un collegamento pubblico, sono consentiti solo i collegamenti protetti",
 "Sharing %s failed, because sharing with links is not allowed" => "Condivisione di %s non riuscita, poiché i collegamenti non sono consentiti",
 "Share type %s is not valid for %s" => "Il tipo di condivisione %s non è valido per %s",
 "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Impostazione permessi per %s non riuscita, poiché i permessi superano i permessi accordati a %s",
diff --git a/lib/l10n/ja.php b/lib/l10n/ja.php
index 6d72836f77..19cdb5f13c 100644
--- a/lib/l10n/ja.php
+++ b/lib/l10n/ja.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"You are accessing the server from an untrusted domain." => "あなたはサーバに、信用が付与されていないドメインからアクセスしています。",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "管理者に連絡してください。このサーバーの管理者の場合は、\"trusted_domain\" の設定を config/config.php に設定してください。config/config.sample.php にサンプルの設定方法が記載してあります。",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => " \"%s\" アプリは、このバージョンのownCloudと互換性がないためインストールできません。",
 "No app name specified" => "アプリ名が未指定",
 "Help" => "ヘルプ",
@@ -56,6 +58,25 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
 "Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>インストールガイド</a>をよく確認してください。",
 "%s shared »%s« with you" => "%sが あなたと »%s«を共有しました",
+"Sharing %s failed, because the file does not exist" => "%s の共有に失敗しました。そのようなファイルは存在しないからです。",
+"Sharing %s failed, because the user %s is the item owner" => "%s の共有に失敗しました。ユーザー %s がアイテム所有者です。",
+"Sharing %s failed, because the user %s does not exist" => "%s の共有に失敗しました。ユーザー %s が存在しません。",
+"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "%s の共有に失敗しました。ユーザー %s はどのグループにも属していません。%s は、??のメンバーです。",
+"Sharing %s failed, because this item is already shared with %s" => "%s の共有に失敗しました。このアイテムは既に %s で共有されています。",
+"Sharing %s failed, because the group %s does not exist" => "%s の共有に失敗しました。グループ %s は存在しません。",
+"Sharing %s failed, because %s is not a member of the group %s" => "%s の共有に失敗しました。%s は、グループ %s のメンバーではありません。",
+"Sharing %s failed, because sharing with links is not allowed" => "%s の共有に失敗しました。リンクでの共有は許可されていません。",
+"Share type %s is not valid for %s" => "%s の共有方法は、%s には適用できません。",
+"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "%s の権限設定に失敗しました。%s に許可されている権限を越えています。",
+"Setting permissions for %s failed, because the item was not found" => "%s の権限設定に失敗しました。アイテムが存在しません。",
+"Sharing backend %s must implement the interface OCP\\Share_Backend" => "%s のバックエンドの共有には、OCP\\Share_Backend　インターフェースを実装しなければなりません。",
+"Sharing backend %s not found" => "共有バックエンド %s が見つかりません",
+"Sharing backend for %s not found" => "%s のための共有バックエンドが見つかりません",
+"Sharing %s failed, because the user %s is the original sharer" => "%s の共有に失敗しました。ユーザ %s が元々の共有者であるからです。",
+"Sharing %s failed, because the permissions exceed permissions granted to %s" => "%s の共有に失敗しました。%s に付与されている許可を超えているからです。",
+"Sharing %s failed, because resharing is not allowed" => "%s の共有に失敗しました。再共有が許されていないからです。",
+"Sharing %s failed, because the sharing backend for %s could not find its source" => "%s の共有に失敗しました。%s のバックエンド共有に必要なソースが見つかりませんでした。",
+"Sharing %s failed, because the file could not be found in the file cache" => "%s の共有に失敗しました。ファイルキャッシュにファイルがありませんでした。",
 "Could not find category \"%s\"" => "カテゴリ \"%s\" が見つかりませんでした",
 "seconds ago" => "数秒前",
 "_%n minute ago_::_%n minutes ago_" => array("%n 分前"),
@@ -67,6 +88,7 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%nヶ月前"),
 "last year" => "1年前",
 "years ago" => "年前",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "ユーザー名で利用できる文字列は、次のものです： \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
 "A valid username must be provided" => "有効なユーザー名を指定する必要があります",
 "A valid password must be provided" => "有効なパスワードを指定する必要があります",
 "The username is already being used" => "ユーザ名はすでに使われています"
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
index 2c94ebdcc2..977a491ad7 100644
--- a/lib/l10n/ko.php
+++ b/lib/l10n/ko.php
@@ -31,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "앱이 활성화되지 않았습니다",
 "Authentication error" => "인증 오류",
 "Token expired. Please reload page." => "토큰이 만료되었습니다. 페이지를 새로 고치십시오.",
+"Unknown user" => "알려지지 않은 사용자",
 "Files" => "파일",
 "Text" => "텍스트",
 "Images" => "그림",
@@ -39,8 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s 데이터베이스 이름에는 마침표를 사용할 수 없습니다",
 "MS SQL username and/or password not valid: %s" => "MS SQL 사용자 이름이나 암호가 잘못되었습니다: %s",
 "You need to enter either an existing account or the administrator." => "기존 계정이나 administrator(관리자)를 입력해야 합니다.",
+"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB 사용자 명 혹은 비밀번호가 일치하지 않습니다",
 "DB Error: \"%s\"" => "DB 오류: \"%s\"",
 "Offending command was: \"%s\"" => "잘못된 명령: \"%s\"",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB '%s'@'localhost' 사용자가 이미 존재합니다",
+"Drop this user from MySQL/MariaDB" => "MySQL/MariaDB에서 이 사용자 제거하기",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB '%s'@'%%' 사용자가 이미 존재합니다",
+"Drop this user from MySQL/MariaDB." => "MySQL/MariaDB에서 이 사용자 제거하기",
 "Oracle connection could not be established" => "Oracle 연결을 수립할 수 없습니다.",
 "Oracle username and/or password not valid" => "Oracle 사용자 이름이나 암호가 잘못되었습니다.",
 "Offending command was: \"%s\", name: %s, password: %s" => "잘못된 명령: \"%s\", 이름: %s, 암호: %s",
@@ -61,7 +67,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n달 전 "),
 "last year" => "작년",
 "years ago" => "년 전",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "사용자 명에는 다음과 같은 문자만 사용이 가능합니다: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
 "A valid username must be provided" => "올바른 사용자 이름을 입력해야 함",
-"A valid password 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/nl.php b/lib/l10n/nl.php
index c43703c504..736de5877c 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"You are accessing the server from an untrusted domain." => "U benadert de server vanaf een niet vertrouwd domein.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Neem contact op met uw beheerder. Als u de beheerder van deze service bent, configureer dan de \"trusted_domain\" instelling in config/config.php. Een voorbeeldconfiguratie is gegeven in config/config.sample.php.",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "App \"%s\" kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud.",
 "No app name specified" => "De app naam is niet gespecificeerd.",
 "Help" => "Help",
@@ -56,6 +58,25 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
 "Please double check the <a href='%s'>installation guides</a>." => "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
 "%s shared »%s« with you" => "%s deelde »%s« met jou",
+"Sharing %s failed, because the file does not exist" => "Delen van %s is mislukt, omdat het bestand niet bestaat",
+"Sharing %s failed, because the user %s is the item owner" => "Delen van %s is mislukt, omdat de gebruiker %s de eigenaar is",
+"Sharing %s failed, because the user %s does not exist" => "Delen van %s is mislukt, omdat gebruiker %s niet bestaat",
+"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Delen van %s is mislukt, omdat gebruiker %s geen lid is van een groep waar %s lid van is",
+"Sharing %s failed, because this item is already shared with %s" => "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s",
+"Sharing %s failed, because the group %s does not exist" => "Delen van %s is mislukt, omdat groep %s niet bestaat",
+"Sharing %s failed, because %s is not a member of the group %s" => "Delen van %s is mislukt, omdat %s geen lid is van groep %s",
+"Sharing %s failed, because sharing with links is not allowed" => "Delen van %s is mislukt, omdat het delen met links niet is toegestaan",
+"Share type %s is not valid for %s" => "Delen van type %s is niet geldig voor %s",
+"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Instellen van de permissies voor %s is mislukt, omdat de permissies hoger zijn dan de aan %s toegekende permissies",
+"Setting permissions for %s failed, because the item was not found" => "Instellen van de permissies voor %s is mislukt, omdat het object niet is gevonden",
+"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Het share-backend %s moet de OCP\\Share_Backend interface implementeren",
+"Sharing backend %s not found" => "Het share-backend %s is niet gevonden",
+"Sharing backend for %s not found" => "Het share-backend voor %s is niet gevonden",
+"Sharing %s failed, because the user %s is the original sharer" => "Delen van %s is mislukt, omdat gebruiker %s de originele deler is",
+"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Delen van %s is mislukt, omdat de rechten de aan %s toegekende autorisaties overschrijden",
+"Sharing %s failed, because resharing is not allowed" => "Delen van %s is mislukt, omdat her-delen niet is toegestaan",
+"Sharing %s failed, because the sharing backend for %s could not find its source" => "Delen van %s is mislukt, omdat de share-backend voor %s de bron niet kon vinden",
+"Sharing %s failed, because the file could not be found in the file cache" => "Delen van %s is mislukt, omdat het bestand niet in de bestandscache kon worden gevonden",
 "Could not find category \"%s\"" => "Kon categorie \"%s\" niet vinden",
 "seconds ago" => "seconden geleden",
 "_%n minute ago_::_%n minutes ago_" => array("%n minuut geleden","%n minuten geleden"),
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 66af696900..59fc613dfd 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"You are accessing the server from an untrusted domain." => "Dostajesz się do serwera z niezaufanej domeny.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Proszę skontaktuj się z administratorem. Jeśli jesteś administratorem tej instancji, skonfiguruj parametr \"trusted_domain\" w pliku config/config.php. Przykładowa konfiguracja jest dostępna w pliku config/config.sample.php.",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikacja \"%s\" nie może zostać zainstalowana, ponieważ nie jest zgodna z tą wersją ownCloud.",
 "No app name specified" => "Nie określono nazwy aplikacji",
 "Help" => "Pomoc",
@@ -56,6 +58,7 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
 "Please double check the <a href='%s'>installation guides</a>." => "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>.",
 "%s shared »%s« with you" => "%s Współdzielone »%s« z tobą",
+"Sharing %s failed, because the file does not exist" => "Wspóldzielenie %s nie powiodło się. ponieważ plik nie istnieje",
 "Sharing %s failed, because the user %s is the item owner" => "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s jest właścicielem elementu",
 "Sharing %s failed, because the user %s does not exist" => "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s nie istnieje",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s nie jest członkiem żadnej grupy której członkiem jest %s",
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 9144e5eeeb..d86b686225 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -1,7 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "You are accessing the server from an untrusted domain." => "Você está acessando o servidor a partir de um domínio não confiável.",
-"Please contact your administrator" => "Por favor, contate o administrador.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Por favor, contate o administrador. Se você é um administrador desta instância, configurre o \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "O aplicativo \"%s\" não pode ser instalado porque não é compatível com esta versão do ownCloud.",
 "No app name specified" => "O nome do aplicativo não foi especificado.",
 "Help" => "Ajuda",
@@ -65,6 +65,7 @@ $TRANSLATIONS = array(
 "Sharing %s failed, because this item is already shared with %s" => "Compartilhamento %s falhou, porque este ítem já está compartilhado com %s",
 "Sharing %s failed, because the group %s does not exist" => "Compartilhamento %s falhou, porque o grupo %s não existe",
 "Sharing %s failed, because %s is not a member of the group %s" => "Compartilhamento %s falhou, porque  %s não é membro do grupo %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Você precisa fornecer uma senha para criar um link público, apenas links protegidos são permitidos",
 "Sharing %s failed, because sharing with links is not allowed" => "Compartilhamento %s falhou, porque compartilhamento com links não é permitido",
 "Share type %s is not valid for %s" => "Tipo de compartilhamento %s não é válido para %s",
 "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s",
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index 8b3c003678..d2257afc7b 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -40,8 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s não é permitido utilizar pontos (.) no nome da base de dados",
 "MS SQL username and/or password not valid: %s" => "Nome de utilizador/password do MySQL é inválido: %s",
 "You need to enter either an existing account or the administrator." => "Precisa de introduzir uma conta existente ou de administrador",
+"MySQL/MariaDB username and/or password not valid" => "Nome de utilizador/password do MySQL/Maria DB inválida",
 "DB Error: \"%s\"" => "Erro na BD: \"%s\"",
 "Offending command was: \"%s\"" => "O comando gerador de erro foi: \"%s\"",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "O utilizador '%s'@'localhost' do MySQL/MariaDB já existe.",
+"Drop this user from MySQL/MariaDB" => "Eliminar este utilizador do MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "O utilizador '%s'@'%%' do MySQL/MariaDB já existe",
+"Drop this user from MySQL/MariaDB." => "Eliminar este utilizador do MySQL/MariaDB",
 "Oracle connection could not be established" => "Não foi possível estabelecer a ligação Oracle",
 "Oracle username and/or password not valid" => "Nome de utilizador/password do Oracle inválida",
 "Offending command was: \"%s\", name: %s, password: %s" => "O comando gerador de erro foi: \"%s\", nome: %s, password: %s",
@@ -50,7 +55,9 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Definiar uma password de administrador",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
-"%s shared »%s« with you" => "%s partilhado »%s« contigo",
+"%s shared »%s« with you" => "%s partilhado »%s« consigo",
+"Sharing %s failed, because the user %s is the item owner" => "A partilha %s falhou, porque o utilizador %s é o proprietário",
+"Sharing %s failed, because the user %s does not exist" => "A partilha %s falhou, porque o utilizador %s nao existe",
 "Could not find category \"%s\"" => "Não foi encontrado a categoria \"%s\"",
 "seconds ago" => "Minutos atrás",
 "_%n minute ago_::_%n minutes ago_" => array("","%n minutos atrás"),
@@ -62,7 +69,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","%n meses atrás"),
 "last year" => "ano passado",
 "years ago" => "anos atrás",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Apenas os seguintes caracteres são permitidos no nome de utilizador: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"",
 "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"
+"A valid password must be provided" => "Uma password válida deve ser fornecida",
+"The username is already being used" => "O nome de utilizador já está a ser usado"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index 2611fcf7a6..38532d0b3b 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -31,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "Приложение не разрешено",
 "Authentication error" => "Ошибка аутентификации",
 "Token expired. Please reload page." => "Токен просрочен. Перезагрузите страницу.",
+"Unknown user" => "Неизвестный пользователь",
 "Files" => "Файлы",
 "Text" => "Текст",
 "Images" => "Изображения",
@@ -39,8 +40,13 @@ $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 '%s'@'localhost' уже существует.",
+"Drop this user from MySQL/MariaDB" => "Удалить данного участника из MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "Пользователь MySQL '%s'@'%%' уже существует.",
+"Drop this user from MySQL/MariaDB." => "Удалить данного участника из MySQL/MariaDB.",
 "Oracle connection could not be established" => "соединение с Oracle не может быть установлено",
 "Oracle username and/or password not valid" => "Неверное имя пользователя и/или пароль Oracle",
 "Offending command was: \"%s\", name: %s, password: %s" => "Вызываемая команда была: \"%s\", имя: %s, пароль: %s",
@@ -50,6 +56,15 @@ $TRANSLATIONS = array(
 "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« с вами",
+"Sharing %s failed, because the user %s is the item owner" => "Не удалось установить общий доступ для %s, пользователь %s уже  является владельцем",
+"Sharing %s failed, because the user %s does not exist" => "Не удалось установить общий доступ для %s, пользователь %s не существует.",
+"Sharing %s failed, because this item is already shared with %s" => "Не удалось установить общий доступ для %s ,в виду того что, объект уже находиться в общем доступе с %s",
+"Sharing %s failed, because the group %s does not exist" => "Не удалось установить общий доступ для %s, группа %s не существует.",
+"Sharing %s failed, because %s is not a member of the group %s" => "Не удалось установить общий доступ для %s, %s не является членом группы %s",
+"Sharing %s failed, because sharing with links is not allowed" => "Не удалось установить общий доступ для %s, потому что обмен со ссылками не допускается",
+"Share type %s is not valid for %s" => "Такой втд общего доступа как %s не допустим для %s",
+"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Настройка прав доступа для %s невозможна, поскольку права доступа превышают предоставленные права доступа %s",
+"Setting permissions for %s failed, because the item was not found" => "Не удалось произвести настройку прав доступа для %s , элемент не был найден.",
 "Could not find category \"%s\"" => "Категория \"%s\"  не найдена",
 "seconds ago" => "несколько секунд назад",
 "_%n minute ago_::_%n minutes ago_" => array("%n минута назад","%n минуты назад","%n минут назад"),
@@ -61,7 +76,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n месяц назад","%n месяца назад","%n месяцев назад"),
 "last year" => "в прошлом году",
 "years ago" => "несколько лет назад",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Только следующие символы допускаются в имени пользователя: \"a-z\", \"A-Z\", \"0-9\", и \"_.@-\"",
 "A valid username must be provided" => "Укажите правильное имя пользователя",
-"A valid password must be provided" => "Укажите валидный пароль"
+"A valid password must be provided" => "Укажите валидный пароль",
+"The username is already being used" => "Имя пользователя уже используется"
 );
 $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 4a91bbe4f9..6e3a48a74f 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Please contact your administrator" => "Kontaktujte prosím vášho administrátora",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikácia \"%s\" nemôže byť nainštalovaná kvôli nekompatibilite z touto verziou ownCloudu.",
 "No app name specified" => "Nešpecifikované meno aplikácie",
 "Help" => "Pomoc",
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index eeaa0ddf96..083f966ded 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -56,6 +56,7 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena.",
 "Please double check the <a href='%s'>installation guides</a>." => "Preverite <a href='%s'>navodila namestitve</a>.",
 "%s shared »%s« with you" => "%s je omogočil souporabo »%s«",
+"Sharing %s failed, because the file does not exist" => "Souporaba %s je spodletela, ker ta datoteka ne obstaja",
 "Sharing %s failed, because the user %s is the item owner" => "Nastavljanje souporabe %s je spodletelo, ker je uporabnik %s lastnik predmeta.",
 "Sharing %s failed, because the user %s does not exist" => "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ne obstaja.",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni član nobene skupine, v kateri je tudi uporabnik %s.",
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index ba63531ad7..799aa3dea4 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"You are accessing the server from an untrusted domain." => "Du ansluter till servern från en osäker domän.",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Appen \"%s\" kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud.",
 "No app name specified" => "Inget appnamn angivet",
 "Help" => "Hjälp",
@@ -56,6 +57,7 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
 "Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
 "%s shared »%s« with you" => "%s delade »%s« med dig",
+"Sharing %s failed, because the file does not exist" => "Delning av %s misslyckades på grund av att filen inte existerar",
 "Sharing %s failed, because the user %s is the item owner" => "Delning %s misslyckades därför att användaren %s är den som äger objektet",
 "Sharing %s failed, because the user %s does not exist" => "Delning %s misslyckades därför att användaren %s inte existerar",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Delning %s misslyckades därför att användaren %s inte är medlem i någon utav de grupper som %s är medlem i",
diff --git a/lib/l10n/ta_IN.php b/lib/l10n/ta_IN.php
new file mode 100644
index 0000000000..15f78e0bce
--- /dev/null
+++ b/lib/l10n/ta_IN.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index d7edeea2f5..1a188dd407 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -1,7 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "You are accessing the server from an untrusted domain." => "Sunucuya güvenilmeyen bir alan adından ulaşıyorsunuz.",
-"Please contact your administrator" => "Lütfen yöneticinizle iletişime geçin",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Lütfen yöneticiniz ile iletişime geçin. Eğer bu örneğin bir yöneticisi iseniz, config/config.php dosyası içerisindeki \"trusted_domain\" ayarını yapılandırın. Bu yapılandırmanın bir örneği config/config.sample.php dosyasında verilmiştir.",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "ownCloud yazılımının bu sürümü ile uyumlu olmadığı için \"%s\" uygulaması kurulamaz.",
 "No app name specified" => "Uygulama adı belirtilmedi",
 "Help" => "Yardım",
@@ -65,6 +65,7 @@ $TRANSLATIONS = array(
 "Sharing %s failed, because this item is already shared with %s" => "%s paylaşımı, %s ile zaten paylaşıldığından dolayı başarısız oldu",
 "Sharing %s failed, because the group %s does not exist" => "%s paylaşımı, %s grubu mevcut olmadığından başarısız oldu",
 "Sharing %s failed, because %s is not a member of the group %s" => "%s paylaşımı, %s kullanıcısı %s grup üyesi olmadığından başarısız oldu",
+"You need to provide a password to create a public link, only protected links are allowed" => "Herkese açık bir bağlantı oluşturmak için bir parola belirtmeniz gerekiyor. Sadece korunmuş bağlantılara izin verilmektedir",
 "Sharing %s failed, because sharing with links is not allowed" => "%s paylaşımı, bağlantılar ile paylaşım izin verilmediğinden başarısız oldu",
 "Share type %s is not valid for %s" => "%s paylaşım türü %s için geçerli değil",
 "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "%s için izinler, izinler %s için verilen izinleri aştığından dolayı ayarlanamadı",
diff --git a/lib/l10n/ur_PK.php b/lib/l10n/ur_PK.php
index 7dc967ccd9..351e3fae14 100644
--- a/lib/l10n/ur_PK.php
+++ b/lib/l10n/ur_PK.php
@@ -5,10 +5,18 @@ $TRANSLATIONS = array(
 "Settings" => "سیٹینگز",
 "Users" => "یوزرز",
 "Admin" => "ایڈمن",
+"Unknown filetype" => "غیر معرروف قسم کی فائل",
+"Invalid image" => "غلط تصویر",
 "web services under your control" => "آپ کے اختیار میں ویب سروسیز",
+"seconds ago" => "سیکنڈز پہلے",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
+"today" => "آج",
+"yesterday" => "کل",
 "_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
+"last month" => "پچھلے مہنیے",
+"_%n month ago_::_%n months ago_" => array("",""),
+"last year" => "پچھلے سال",
+"years ago" => "سالوں پہلے"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index 8fca52f3db..c5261a6aff 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"You are accessing the server from an untrusted domain." => "您正在访问来自不信任域名的服务器。",
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "App “%s” 无法安装，因为它和当前 ownCloud 版本不兼容。",
+"No app name specified" => "没有指定的 App 名称",
 "Help" => "帮助",
 "Personal" => "个人",
 "Settings" => "设置",
@@ -13,12 +16,23 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "需要逐一下载文件",
 "Back to Files" => "回到文件",
 "Selected files too large to generate zip file." => "选择的文件太大，无法生成 zip 文件。",
+"Please download the files separately in smaller chunks or kindly ask your administrator." => "请用较小的分块下载文件或者友好地询问您的管理员。",
+"No source specified when installing app" => "安装 App 时未指定来源",
+"No href specified when installing app from http" => "从 http 安装 App 时未指定链接",
+"No path specified when installing app from local file" => "从本地文件安装 App 时未指定路径",
+"Archives of type %s are not supported" => "不支持 %s 的压缩格式",
+"Failed to open archive when installing app" => "安装 App 是打开归档失败",
 "App does not provide an info.xml file" => "应用未提供 info.xml 文件",
+"App can't be installed because of not allowed code in the App" => "App 无法安装，因为 App 中有非法代码 ",
+"App can't be installed because it is not compatible with this version of ownCloud" => "App 无法安装，因为和当前 ownCloud 版本不兼容",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "App 无法安装，因为 App 包含不允许在非内置 App 中使用的 <shipped>true</shipped> 标签",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "App 无法安装因为 info.xml/version 中的版本和 App 商店版本不同",
 "App directory already exists" => "应用程序目录已存在",
 "Can't create app folder. Please fix permissions. %s" => "无法创建应用程序文件夹。请修正权限。%s",
 "Application is not enabled" => "应用程序未启用",
 "Authentication error" => "认证出错",
 "Token expired. Please reload page." => "Token 过期，请刷新页面。",
+"Unknown user" => "未知用户",
 "Files" => "文件",
 "Text" => "文本",
 "Images" => "图片",
@@ -27,8 +41,13 @@ $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 数据库中删除此用户",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB 用户 '%s'@'%%' 已存在",
+"Drop this user from MySQL/MariaDB." => "建议从 MySQL/MariaDB 数据库中删除此用户。",
 "Oracle connection could not be established" => "不能建立甲骨文连接",
 "Oracle username and/or password not valid" => "Oracle 数据库用户名和/或密码无效",
 "Offending command was: \"%s\", name: %s, password: %s" => "冲突命令为：\"%s\"，名称：%s，密码：%s",
@@ -38,6 +57,25 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
 "Please double check the <a href='%s'>installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.",
 "%s shared »%s« with you" => "%s 向您分享了 »%s«",
+"Sharing %s failed, because the file does not exist" => "共享 %s 失败，因为文件不存在。",
+"Sharing %s failed, because the user %s is the item owner" => "共享 %s 失败，因为用户 %s 是对象的拥有者",
+"Sharing %s failed, because the user %s does not exist" => "共享 %s 失败，因为用户 %s 不存在",
+"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "共享 %s 失败，因为用户 %s 不是 %s 所属的任何组的用户",
+"Sharing %s failed, because this item is already shared with %s" => "共享 %s 失败，因为它已经共享给 %s",
+"Sharing %s failed, because the group %s does not exist" => "共享 %s 失败，因为 %s 组不存在",
+"Sharing %s failed, because %s is not a member of the group %s" => "共享 %s 失败，因为 %s 不是 %s 组的成员",
+"Sharing %s failed, because sharing with links is not allowed" => "共享 %s 失败，因为不允许用链接共享",
+"Share type %s is not valid for %s" => "%s 不是 %s 的合法共享类型",
+"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "设置 %s 权限失败，因为权限超出了 %s 已有权限。",
+"Setting permissions for %s failed, because the item was not found" => "设置 %s 的权限失败，因为未找到到对应项",
+"Sharing backend %s must implement the interface OCP\\Share_Backend" => "共享后端 %s 必须实现 OCP\\Share_Backend 接口",
+"Sharing backend %s not found" => "未找到共享后端 %s",
+"Sharing backend for %s not found" => "%s 的共享后端未找到",
+"Sharing %s failed, because the user %s is the original sharer" => "共享 %s 失败，因为用户 %s 不是原始共享者",
+"Sharing %s failed, because the permissions exceed permissions granted to %s" => "共享 %s 失败，因为权限超过了 %s 已有权限",
+"Sharing %s failed, because resharing is not allowed" => "共享 %s 失败，因为不允许二次共享",
+"Sharing %s failed, because the sharing backend for %s could not find its source" => "共享 %s 失败，因为 %s 使用的共享后端未找到它的来源",
+"Sharing %s failed, because the file could not be found in the file cache" => "共享 %s 失败，因为未在文件缓存中找到文件。",
 "Could not find category \"%s\"" => "无法找到分类 \"%s\"",
 "seconds ago" => "秒前",
 "_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"),
@@ -49,7 +87,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n 月前"),
 "last year" => "去年",
 "years ago" => "年前",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "用户名只允许使用以下字符：“a-z”，“A-Z”，“0-9”，和“_.@-”",
 "A valid username must be provided" => "必须提供合法的用户名",
-"A valid password 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/private/app.php b/lib/private/app.php
index 2f55b54b32..575cc9f41a 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -37,7 +37,7 @@ class OC_App{
 	static private $altLogin = array();
 
 	/**
-	 * @brief clean the appid
+	 * clean the appid
 	 * @param string|boolean $app Appid that needs to be cleaned
 	 * @return string
 	 */
@@ -46,7 +46,7 @@ class OC_App{
 	}
 
 	/**
-	 * @brief loads all apps
+	 * loads all apps
 	 * @param array $types
 	 * @return bool
 	 *
@@ -187,7 +187,7 @@ class OC_App{
 	}
 
 	/**
-	 * @brief checks whether or not an app is enabled
+	 * checks whether or not an app is enabled
 	 * @param string $app app
 	 * @return bool
 	 *
@@ -202,7 +202,7 @@ class OC_App{
 	}
 
 	/**
-	 * @brief enables an app
+	 * enables an app
 	 * @param mixed $app app
 	 * @throws \Exception
 	 * @return void
@@ -250,7 +250,7 @@ class OC_App{
 	}
 
 	/**
-	 * @brief disables an app
+	 * disables an app
 	 * @param string $app app
 	 * @return boolean|null
 	 *
@@ -269,7 +269,7 @@ class OC_App{
 	}
 
 	/**
-	 * @brief adds an entry to the navigation
+	 * adds an entry to the navigation
 	 * @param array $data array containing the data
 	 * @return bool
 	 *
@@ -291,7 +291,7 @@ class OC_App{
 	}
 
 	/**
-	 * @brief marks a navigation entry as active
+	 * marks a navigation entry as active
 	 * @param string $id id of the entry
 	 * @return bool
 	 *
@@ -305,9 +305,9 @@ class OC_App{
 	}
 
 	/**
-	 * @brief Get the navigation entries for the $app
+	 * Get the navigation entries for the $app
 	 * @param string $app app
-	 * @return array of the $data added with addNavigationEntry
+	 * @return array an array of the $data added with addNavigationEntry
 	 *
 	 * Warning: destroys the existing entries
 	 */
@@ -321,7 +321,7 @@ class OC_App{
 	}
 
 	/**
-	 * @brief gets the active Menu entry
+	 * gets the active Menu entry
 	 * @return string id or empty string
 	 *
 	 * This function returns the id of the active navigation entry (set by
@@ -332,7 +332,7 @@ class OC_App{
 	}
 
 	/**
-	 * @brief Returns the Settings Navigation
+	 * Returns the Settings Navigation
 	 * @return string
 	 *
 	 * This function returns an array containing all settings pages added. The
@@ -500,7 +500,7 @@ class OC_App{
 	}
 
 	/**
-	 * @brief Read all app metadata from the info.xml file
+	 * Read all app metadata from the info.xml file
 	 * @param string $appid id of the app or the path of the info.xml file
 	 * @param boolean $path (optional)
 	 * @return array
@@ -567,7 +567,7 @@ class OC_App{
 	}
 
 	/**
-	 * @brief Returns the navigation
+	 * Returns the navigation
 	 * @return array
 	 *
 	 * This function returns an array containing all entries added. The
@@ -659,8 +659,8 @@ class OC_App{
 	}
 
 	/**
-	 * @brief: get a list of all apps in the apps folder
-	 * @return array or app names (string IDs)
+	 * get a list of all apps in the apps folder
+	 * @return array an array of app names (string IDs)
 	 * @todo: change the name of this method to getInstalledApps, which is more accurate
 	 */
 	public static function getAllApps() {
@@ -692,7 +692,7 @@ class OC_App{
 	}
 
 	/**
-	 * @brief: Lists all apps, this is used in apps.php
+	 * Lists all apps, this is used in apps.php
 	 * @return array
 	 */
 	public static function listAllApps() {
@@ -766,7 +766,7 @@ class OC_App{
 	}
 
 	/**
-	 * @brief: Internal custom sort funtion to bring the app into the right order. Should only be called by listAllApps
+	 * Internal custom sort funtion to bring the app into the right order. Should only be called by listAllApps
 	 * @return array
 	 */
 	private static function customSort($a, $b) {
@@ -796,7 +796,7 @@ class OC_App{
 	}
 
 	/**
-	 * @brief: get a list of all apps on apps.owncloud.com
+	 * get a list of all apps on apps.owncloud.com
 	 * @return array, multi-dimensional array of apps.
 	 *     Keys: id, name, type, typename, personid, license, detailpage, preview, changed, description
 	 */
diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php
index 0cd6b3bc35..e2a961b1d6 100644
--- a/lib/private/appconfig.php
+++ b/lib/private/appconfig.php
@@ -89,8 +89,8 @@ class AppConfig implements \OCP\IAppConfig {
 	}
 
 	/**
-	 * @brief Get all apps using the config
-	 * @return array with app ids
+	 * Get all apps using the config
+	 * @return array an array of app ids
 	 *
 	 * This function returns a list of all apps that have at least one
 	 * entry in the appconfig table.
@@ -107,9 +107,9 @@ class AppConfig implements \OCP\IAppConfig {
 	}
 
 	/**
-	 * @brief Get the available keys for an app
+	 * Get the available keys for an app
 	 * @param string $app the app we are looking for
-	 * @return array with key names
+	 * @return array an array of key names
 	 *
 	 * This function gets all keys of an app. Please note that the values are
 	 * not returned.
@@ -122,7 +122,7 @@ class AppConfig implements \OCP\IAppConfig {
 	}
 
 	/**
-	 * @brief Gets the config value
+	 * Gets the config value
 	 * @param string $app app
 	 * @param string $key key
 	 * @param string $default = null, default value if the key does not exist
@@ -141,7 +141,7 @@ class AppConfig implements \OCP\IAppConfig {
 	}
 
 	/**
-	 * @brief check if a key is set in the appconfig
+	 * check if a key is set in the appconfig
 	 * @param string $app
 	 * @param string $key
 	 * @return bool
@@ -152,7 +152,7 @@ class AppConfig implements \OCP\IAppConfig {
 	}
 
 	/**
-	 * @brief sets a value in the appconfig
+	 * sets a value in the appconfig
 	 * @param string $app app
 	 * @param string $key key
 	 * @param string $value value
@@ -185,7 +185,7 @@ class AppConfig implements \OCP\IAppConfig {
 	}
 
 	/**
-	 * @brief Deletes a key
+	 * Deletes a key
 	 * @param string $app app
 	 * @param string $key key
 	 * @return boolean|null
@@ -202,7 +202,7 @@ class AppConfig implements \OCP\IAppConfig {
 	}
 
 	/**
-	 * @brief Remove app from appconfig
+	 * Remove app from appconfig
 	 * @param string $app app
 	 * @return boolean|null
 	 *
diff --git a/lib/private/appframework/app.php b/lib/private/appframework/app.php
index 3b13194862..baf52d0205 100644
--- a/lib/private/appframework/app.php
+++ b/lib/private/appframework/app.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/private/appframework/core/api.php b/lib/private/appframework/core/api.php
index e7269373bb..ba6b9f95cb 100644
--- a/lib/private/appframework/core/api.php
+++ b/lib/private/appframework/core/api.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -119,7 +119,7 @@ class API implements IApi{
 	}
 
 	/**
-	 * @brief connects a function to a hook
+	 * connects a function to a hook
 	 * @param string $signalClass class name of emitter
 	 * @param string $signalName name of signal
 	 * @param string $slotClass class name of slot
@@ -133,10 +133,10 @@ class API implements IApi{
 	}
 
 	/**
-	 * @brief Emits a signal. To get data from the slot use references!
+	 * Emits a signal. To get data from the slot use references!
 	 * @param string $signalClass class name of emitter
 	 * @param string $signalName name of signal
-	 * @param array $params defautl: array() array with additional data
+	 * @param array $params default: array() array with additional data
 	 * @return bool, true if slots exists or false if not
 	 */
 	public function emitHook($signalClass, $signalName, $params = array()) {
@@ -144,7 +144,7 @@ class API implements IApi{
 	}
 
 	/**
-	 * @brief clear hooks
+	 * clear hooks
 	 * @param string $signalClass
 	 * @param string $signalName
 	 */
diff --git a/lib/private/appframework/db/db.php b/lib/private/appframework/db/db.php
new file mode 100644
index 0000000000..fc77a38f81
--- /dev/null
+++ b/lib/private/appframework/db/db.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.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\AppFramework\Db;
+
+use \OCP\IDb;
+
+
+/**
+ * Small Facade for being able to inject the database connection for tests
+ */
+class Db implements IDb {
+
+
+    /**
+     * Used to abstract the owncloud database access away
+     * @param string $sql the sql query with ? placeholder for params
+     * @param int $limit the maximum number of rows
+     * @param int $offset from which row we want to start
+     * @return \OC_DB_StatementWrapper prepared SQL query
+     */
+    public function prepareQuery($sql, $limit=null, $offset=null){
+        return \OCP\DB::prepare($sql, $limit, $offset);
+    }
+
+
+    /**
+     * Used to get the id of the just inserted element
+     * @param string $tableName the name of the table where we inserted the item
+     * @return int the id of the inserted element
+     */
+    public function getInsertId($tableName){
+        return \OCP\DB::insertid($tableName);
+    }
+
+
+}
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index e478225a53..ee492b8a9e 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -30,8 +30,10 @@ use OC\AppFramework\Http\Dispatcher;
 use OC\AppFramework\Core\API;
 use OC\AppFramework\Middleware\MiddlewareDispatcher;
 use OC\AppFramework\Middleware\Security\SecurityMiddleware;
+use OC\AppFramework\Middleware\Security\CORSMiddleware;
 use OC\AppFramework\Utility\SimpleContainer;
 use OC\AppFramework\Utility\TimeFactory;
+use OC\AppFramework\Utility\ControllerMethodReflector;
 use OCP\AppFramework\IApi;
 use OCP\AppFramework\IAppContainer;
 use OCP\AppFramework\Middleware;
@@ -80,7 +82,12 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 		});
 
 		$this['Dispatcher'] = $this->share(function($c) {
-			return new Dispatcher($c['Protocol'], $c['MiddlewareDispatcher']);
+			return new Dispatcher(
+				$c['Protocol'], 
+				$c['MiddlewareDispatcher'], 
+				$c['ControllerMethodReflector'],
+				$c['Request']
+			);
 		});
 
 
@@ -89,13 +96,25 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 		 */
 		$app = $this;
 		$this['SecurityMiddleware'] = $this->share(function($c) use ($app){
-			return new SecurityMiddleware($app, $c['Request']);
+			return new SecurityMiddleware(
+				$app, 
+				$c['Request'], 
+				$c['ControllerMethodReflector']
+			);
+		});
+
+		$this['CORSMiddleware'] = $this->share(function($c) {
+			return new CORSMiddleware(
+				$c['Request'],
+				$c['ControllerMethodReflector']
+			);
 		});
 
 		$middleWares = &$this->middleWares;
 		$this['MiddlewareDispatcher'] = $this->share(function($c) use (&$middleWares) {
 			$dispatcher = new MiddlewareDispatcher();
 			$dispatcher->registerMiddleware($c['SecurityMiddleware']);
+			$dispatcher->registerMiddleware($c['CORSMiddleware']);
 
 			foreach($middleWares as $middleWare) {
 				$dispatcher->registerMiddleware($c[$middleWare]);
@@ -112,6 +131,9 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 			return new TimeFactory();
 		});
 
+		$this['ControllerMethodReflector'] = $this->share(function($c) {
+			return new ControllerMethodReflector();
+		});
 
 	}
 
@@ -168,8 +190,8 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 	}
 
 	/**
-	 * @param $message
-	 * @param $level
+	 * @param string $message
+	 * @param string $level
 	 * @return mixed
 	 */
 	function log($message, $level) {
diff --git a/lib/private/appframework/http.php b/lib/private/appframework/http.php
index 65d926105f..2b1387af71 100644
--- a/lib/private/appframework/http.php
+++ b/lib/private/appframework/http.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -33,7 +33,7 @@ class Http extends BaseHttp {
 	protected $headers;
 
 	/**
-	 * @param $_SERVER $server
+	 * @param array $server $_SERVER
 	 * @param string $protocolVersion the http version to use defaults to HTTP/1.1
 	 */
 	public function __construct($server, $protocolVersion='HTTP/1.1') {
diff --git a/lib/private/appframework/http/dispatcher.php b/lib/private/appframework/http/dispatcher.php
index a2afb53f0f..442e33ee72 100644
--- a/lib/private/appframework/http/dispatcher.php
+++ b/lib/private/appframework/http/dispatcher.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -26,7 +26,11 @@ namespace OC\AppFramework\Http;
 
 use \OC\AppFramework\Middleware\MiddlewareDispatcher;
 use \OC\AppFramework\Http;
+use \OC\AppFramework\Utility\ControllerMethodReflector;
+
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\Response;
+use OCP\IRequest;
 
 
 /**
@@ -36,17 +40,25 @@ class Dispatcher {
 
 	private $middlewareDispatcher;
 	private $protocol;
-
+	private $reflector;
+	private $request;
 
 	/**
 	 * @param Http $protocol the http protocol with contains all status headers
 	 * @param MiddlewareDispatcher $middlewareDispatcher the dispatcher which
 	 * runs the middleware
+	 * @param ControllerMethodReflector the reflector that is used to inject
+	 * the arguments for the controller
+	 * @param IRequest $request the incoming request
 	 */
 	public function __construct(Http $protocol,
-	                            MiddlewareDispatcher $middlewareDispatcher) {
+	                            MiddlewareDispatcher $middlewareDispatcher,
+	                            ControllerMethodReflector $reflector,
+	                            IRequest $request) {
 		$this->protocol = $protocol;
 		$this->middlewareDispatcher = $middlewareDispatcher;
+		$this->reflector = $reflector;
+		$this->request = $request;
 	}
 
 
@@ -63,10 +75,13 @@ class Dispatcher {
 		$out = array(null, array(), null);
 
 		try {
+			// prefill reflector with everything thats needed for the 
+			// middlewares
+			$this->reflector->reflect($controller, $methodName);
 
 			$this->middlewareDispatcher->beforeController($controller,
 				$methodName);
-			$response = $controller->$methodName();
+			$response = $this->executeController($controller, $methodName);
 
 			// if an exception appears, the middleware checks if it can handle the
 			// exception and creates a response. If no response is created, it is
@@ -98,4 +113,70 @@ class Dispatcher {
 	}
 
 
+	/**
+	 * Uses the reflected parameters, types and request parameters to execute
+	 * the controller
+	 * @param Controller $controller the controller to be executed
+	 * @param string $methodName the method on the controller that should be executed
+	 * @return Response
+	 */
+	private function executeController($controller, $methodName) {
+		$arguments = array();
+
+		// valid types that will be casted
+		$types = array('int', 'integer', 'bool', 'boolean', 'float');
+
+		foreach($this->reflector->getParameters() as $param => $default) {
+
+			// try to get the parameter from the request object and cast
+			// it to the type annotated in the @param annotation
+			$value = $this->request->getParam($param, $default);
+			$type = $this->reflector->getType($param);
+			
+			// if this is submitted using GET or a POST form, 'false' should be 
+			// converted to false
+			if(($type === 'bool' || $type === 'boolean') &&
+				$value === 'false' && 
+				(
+					$this->request->method === 'GET' ||
+					strpos($this->request->getHeader('Content-Type'), 
+						'application/x-www-form-urlencoded') !== false
+				)
+			) {
+				$value = false;
+
+			} elseif(in_array($type, $types)) {
+				settype($value, $type);
+			}
+			
+			$arguments[] = $value;
+		}
+
+		$response = call_user_func_array(array($controller, $methodName), $arguments);
+
+		// format response if not of type response
+		if(!($response instanceof Response)) {
+			
+			// get format from the url format or request format parameter
+			$format = $this->request->getParam('format');
+			
+			// if none is given try the first Accept header
+			if($format === null) {
+				$header = $this->request->getHeader('Accept');
+				$formats = explode(',', $header);
+
+				if($header !== null && count($formats) > 0) {
+					$accept = strtolower(trim($formats[0]));
+					$format = str_replace('application/', '', $accept);
+				} else {
+					$format = 'json';
+				}
+			}
+
+			$response = $controller->buildResponse($response, $format);
+		}
+
+		return $response;
+	}
+
 }
diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php
index 643fa685ad..8b68ca486f 100644
--- a/lib/private/appframework/http/request.php
+++ b/lib/private/appframework/http/request.php
@@ -3,7 +3,9 @@
  * ownCloud - Request
  *
  * @author Thomas Tanghus
+ * @author Bernhard Posselt
  * @copyright 2013 Thomas Tanghus (thomas@tanghus.net)
+ * @copyright 2014 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/private/appframework/middleware/middlewaredispatcher.php b/lib/private/appframework/middleware/middlewaredispatcher.php
index 598743e523..dcb63a8e55 100644
--- a/lib/private/appframework/middleware/middlewaredispatcher.php
+++ b/lib/private/appframework/middleware/middlewaredispatcher.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/private/appframework/middleware/security/corsmiddleware.php b/lib/private/appframework/middleware/security/corsmiddleware.php
new file mode 100644
index 0000000000..dca3996ea2
--- /dev/null
+++ b/lib/private/appframework/middleware/security/corsmiddleware.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * ownCloud - App Framework
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @copyright Bernhard Posselt 2014
+ */
+
+namespace OC\AppFramework\Middleware\Security;
+
+use OC\AppFramework\Utility\ControllerMethodReflector;
+use OCP\IRequest;
+use OCP\AppFramework\Http\Response;
+use OCP\AppFramework\Middleware;
+
+/**
+ * This middleware sets the correct CORS headers on a response if the 
+ * controller has the @CORS annotation. This is needed for webapps that want
+ * to access an API and dont run on the same domain, see 
+ * https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
+ */
+class CORSMiddleware extends Middleware {
+
+	private $request;
+	private $reflector;
+
+	/**
+	 * @param IRequest $request
+	 * @param ControllerMethodReflector $reflector
+	 */
+	public function __construct(IRequest $request, 
+	                            ControllerMethodReflector $reflector) {
+		$this->request = $request;
+		$this->reflector = $reflector;
+	}
+
+
+	/**
+	 * This is being run after a successful controllermethod call and allows
+	 * the manipulation of a Response object. The middleware is run in reverse order
+	 *
+	 * @param Controller $controller the controller that is being called
+	 * @param string $methodName the name of the method that will be called on
+	 *                           the controller
+	 * @param Response $response the generated response from the controller
+	 * @return Response a Response object
+	 */
+	public function afterController($controller, $methodName, Response $response){
+		// only react if its a CORS request and if the request sends origin and
+
+		if(isset($this->request->server['HTTP_ORIGIN']) &&
+			$this->reflector->hasAnnotation('CORS')) {
+
+			// allow credentials headers must not be true or CSRF is possible 
+			// otherwise
+			foreach($response->getHeaders() as $header => $value ) {
+				if(strtolower($header) === 'access-control-allow-credentials' &&
+				   strtolower(trim($value)) === 'true') {
+					$msg = 'Access-Control-Allow-Credentials must not be '.
+						   'set to true in order to prevent CSRF';
+					throw new SecurityException($msg);
+				}
+			}
+
+			$origin = $this->request->server['HTTP_ORIGIN'];
+			$response->addHeader('Access-Control-Allow-Origin', $origin);
+		}
+		return $response;
+	}
+
+
+}
diff --git a/lib/private/appframework/middleware/security/securityexception.php b/lib/private/appframework/middleware/security/securityexception.php
index e551675acd..df37d5e327 100644
--- a/lib/private/appframework/middleware/security/securityexception.php
+++ b/lib/private/appframework/middleware/security/securityexception.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/private/appframework/middleware/security/securitymiddleware.php b/lib/private/appframework/middleware/security/securitymiddleware.php
index 0f160d224a..d7e398fe44 100644
--- a/lib/private/appframework/middleware/security/securitymiddleware.php
+++ b/lib/private/appframework/middleware/security/securitymiddleware.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -25,7 +25,7 @@
 namespace OC\AppFramework\Middleware\Security;
 
 use OC\AppFramework\Http;
-use OC\AppFramework\Utility\MethodAnnotationReader;
+use OC\AppFramework\Utility\ControllerMethodReflector;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Middleware;
 use OCP\AppFramework\Http\Response;
@@ -52,13 +52,21 @@ class SecurityMiddleware extends Middleware {
 	 */
 	private $request;
 
+	/**
+	 * @var OC\AppFramework\Utility\ControllerMethodReflector
+	 */
+	private $reflector;
+
 	/**
 	 * @param IAppContainer $app
 	 * @param IRequest $request
+	 * @param ControllerMethodReflector $reflector
 	 */
-	public function __construct(IAppContainer $app, IRequest $request){
+	public function __construct(IAppContainer $app, IRequest $request,
+	                            ControllerMethodReflector $reflector){
 		$this->app = $app;
 		$this->request = $request;
+		$this->reflector = $reflector;
 	}
 
 
@@ -72,28 +80,25 @@ class SecurityMiddleware extends Middleware {
 	 */
 	public function beforeController($controller, $methodName){
 
-		// get annotations from comments
-		$annotationReader = new MethodAnnotationReader($controller, $methodName);
-
 		// this will set the current navigation entry of the app, use this only
 		// for normal HTML requests and not for AJAX requests
 		$this->app->getServer()->getNavigationManager()->setActiveEntry($this->app->getAppName());
 
 		// security checks
-		$isPublicPage = $annotationReader->hasAnnotation('PublicPage');
+		$isPublicPage = $this->reflector->hasAnnotation('PublicPage');
 		if(!$isPublicPage) {
 			if(!$this->app->isLoggedIn()) {
 				throw new SecurityException('Current user is not logged in', Http::STATUS_UNAUTHORIZED);
 			}
 
-			if(!$annotationReader->hasAnnotation('NoAdminRequired')) {
+			if(!$this->reflector->hasAnnotation('NoAdminRequired')) {
 				if(!$this->app->isAdminUser()) {
 					throw new SecurityException('Logged in user must be an admin', Http::STATUS_FORBIDDEN);
 				}
 			}
 		}
 
-		if(!$annotationReader->hasAnnotation('NoCSRFRequired')) {
+		if(!$this->reflector->hasAnnotation('NoCSRFRequired')) {
 			if(!$this->request->passesCSRFCheck()) {
 				throw new SecurityException('CSRF check failed', Http::STATUS_PRECONDITION_FAILED);
 			}
diff --git a/lib/private/appframework/routing/routeconfig.php b/lib/private/appframework/routing/routeconfig.php
index a3bbde6af5..91ea7778d0 100644
--- a/lib/private/appframework/routing/routeconfig.php
+++ b/lib/private/appframework/routing/routeconfig.php
@@ -61,7 +61,7 @@ class RouteConfig {
 
 	/**
 	 * Creates one route base on the give configuration
-	 * @param $routes
+	 * @param array $routes
 	 * @throws \UnexpectedValueException
 	 */
 	private function processSimpleRoutes($routes)
@@ -105,7 +105,7 @@ class RouteConfig {
 	 *  - update
 	 *  - destroy
 	 *
-	 * @param $routes
+	 * @param array $routes
 	 */
 	private function processResources($routes)
 	{
@@ -151,7 +151,7 @@ class RouteConfig {
 
 	/**
 	 * Based on a given route name the controller name is generated
-	 * @param $controller
+	 * @param string $controller
 	 * @return string
 	 */
 	private function buildControllerName($controller)
@@ -161,7 +161,7 @@ class RouteConfig {
 
 	/**
 	 * Based on the action part of the route name the controller method name is generated
-	 * @param $action
+	 * @param string $action
 	 * @return string
 	 */
 	private function buildActionName($action) {
@@ -170,7 +170,7 @@ class RouteConfig {
 
 	/**
 	 * Generates the id used in the url part o the route url
-	 * @param $resource
+	 * @param string $resource
 	 * @return string
 	 */
 	private function buildResourceId($resource) {
@@ -179,7 +179,7 @@ class RouteConfig {
 
 	/**
 	 * Underscored strings are converted to camel case strings
-	 * @param $str string
+	 * @param string $str
 	 * @return string
 	 */
 	private function underScoreToCamelCase($str) {
diff --git a/lib/private/appframework/utility/methodannotationreader.php b/lib/private/appframework/utility/controllermethodreflector.php
similarity index 52%
rename from lib/private/appframework/utility/methodannotationreader.php
rename to lib/private/appframework/utility/controllermethodreflector.php
index 42060a0852..a1519c7280 100644
--- a/lib/private/appframework/utility/methodannotationreader.php
+++ b/lib/private/appframework/utility/controllermethodreflector.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2014 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -28,23 +28,68 @@ namespace OC\AppFramework\Utility;
 /**
  * Reads and parses annotations from doc comments
  */
-class MethodAnnotationReader {
+class ControllerMethodReflector {
 
 	private $annotations;
+	private $types;
+	private $parameters;
+
+	public function __construct() {
+		$this->types = array();
+		$this->parameters = array();
+		$this->annotations = array();
+	}
+
 
 	/**
 	 * @param object $object an object or classname
-	 * @param string $method the method which we want to inspect for annotations
+	 * @param string $method the method which we want to inspect
 	 */
-	public function __construct($object, $method){
-		$this->annotations = array();
-
+	public function reflect($object, $method){
 		$reflection = new \ReflectionMethod($object, $method);
 		$docs = $reflection->getDocComment();
 
 		// extract everything prefixed by @ and first letter uppercase
 		preg_match_all('/@([A-Z]\w+)/', $docs, $matches);
 		$this->annotations = $matches[1];
+
+		// extract type parameter information
+		preg_match_all('/@param (?<type>\w+) \$(?<var>\w+)/', $docs, $matches);
+		$this->types = array_combine($matches['var'], $matches['type']);
+
+		// get method parameters
+		foreach ($reflection->getParameters() as $param) {
+			if($param->isOptional()) {
+				$default = $param->getDefaultValue();
+			} else {
+				$default = null;
+			}
+			$this->parameters[$param->name] = $default;
+		}
+	}
+
+
+	/**
+	 * Inspects the PHPDoc parameters for types
+	 * @param string $parameter the parameter whose type comments should be 
+	 * parsed
+	 * @return string|null type in the type parameters (@param int $something) 
+	 * would return int or null if not existing
+	 */
+	public function getType($parameter) {
+		if(array_key_exists($parameter, $this->types)) {
+			return $this->types[$parameter];
+		} else {
+			return null;
+		}
+	}
+
+
+	/**
+	 * @return array the arguments of the method with key => default value
+	 */
+	public function getParameters() {
+		return $this->parameters;
 	}
 
 
diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php
index d08a4879e3..1ad06b9ab2 100644
--- a/lib/private/appframework/utility/simplecontainer.php
+++ b/lib/private/appframework/utility/simplecontainer.php
@@ -2,9 +2,6 @@
 
 namespace OC\AppFramework\Utility;
 
-// register 3rdparty autoloaders
-require_once 'Pimple/Pimple.php';
-
 /**
  * Class SimpleContainer
  *
diff --git a/lib/private/appframework/utility/timefactory.php b/lib/private/appframework/utility/timefactory.php
index 2c3dd6cf5e..a9b07a356e 100644
--- a/lib/private/appframework/utility/timefactory.php
+++ b/lib/private/appframework/utility/timefactory.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/private/archive/tar.php b/lib/private/archive/tar.php
index cbdb565ba3..21a995d9e5 100644
--- a/lib/private/archive/tar.php
+++ b/lib/private/archive/tar.php
@@ -154,7 +154,7 @@ class OC_Archive_TAR extends OC_Archive{
 	}
 	/**
 	 * get the last modified time of a file in the archive
-	 * @param string path
+	 * @param string $path
 	 * @return int
 	 */
 	function mtime($path) {
diff --git a/lib/private/avatar.php b/lib/private/avatar.php
index e97f55eeca..2286b89687 100644
--- a/lib/private/avatar.php
+++ b/lib/private/avatar.php
@@ -15,16 +15,16 @@ class OC_Avatar implements \OCP\IAvatar {
 	private $view;
 
 	/**
-	 * @brief constructor
-	 * @param $user string user to do avatar-management with
+	 * constructor
+	 * @param string $user user to do avatar-management with
 	*/
 	public function __construct ($user) {
 		$this->view = new \OC\Files\View('/'.$user);
 	}
 
 	/**
-	 * @brief get the users avatar
-	 * @param $size integer size in px of the avatar, avatars are square, defaults to 64
+	 * get the users avatar
+	 * @param int $size size in px of the avatar, avatars are square, defaults to 64
 	 * @return boolean|\OC_Image containing the avatar or false if there's no image
 	*/
 	public function get ($size = 64) {
@@ -43,8 +43,8 @@ class OC_Avatar implements \OCP\IAvatar {
 	}
 
 	/**
-	 * @brief sets the users avatar
-	 * @param $data mixed OC_Image, imagedata or path to set a new avatar
+	 * sets the users avatar
+	 * @param \OC_Image|resource|string $data OC_Image, imagedata or path to set a new avatar
 	 * @throws Exception if the provided file is not a jpg or png image
 	 * @throws Exception if the provided image is not valid
 	 * @throws \OC\NotSquareException if the image is not square
@@ -81,7 +81,7 @@ class OC_Avatar implements \OCP\IAvatar {
 	}
 
 	/**
-	 * @brief remove the users avatar
+	 * remove the users avatar
 	 * @return void
 	*/
 	public function remove () {
diff --git a/lib/private/avatarmanager.php b/lib/private/avatarmanager.php
index 3ca46868ea..6abe87c4f4 100644
--- a/lib/private/avatarmanager.php
+++ b/lib/private/avatarmanager.php
@@ -15,9 +15,9 @@ use OCP\IAvatarManager;
 class AvatarManager implements IAvatarManager {
 
 	/**
-	 * @brief return a user specific instance of \OCP\IAvatar
+	 * return a user specific instance of \OCP\IAvatar
 	 * @see \OCP\IAvatar
-	 * @param $user string the ownCloud user id
+	 * @param string $user the ownCloud user id
 	 * @return \OCP\IAvatar
 	 */
 	function getAvatar($user) {
diff --git a/lib/private/backgroundjob.php b/lib/private/backgroundjob.php
index afc3c27040..922824753b 100644
--- a/lib/private/backgroundjob.php
+++ b/lib/private/backgroundjob.php
@@ -25,7 +25,7 @@
  */
 class OC_BackgroundJob{
 	/**
-	 * @brief get the execution type of background jobs
+	 * get the execution type of background jobs
 	 * @return string
 	 *
 	 * This method returns the type how background jobs are executed. If the user
@@ -36,7 +36,7 @@ class OC_BackgroundJob{
 	}
 
 	/**
-	 * @brief sets the background jobs execution type
+	 * sets the background jobs execution type
 	 * @param string $type execution type
 	 * @return false|null
 	 *
diff --git a/lib/private/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php
index 26c9026934..9fa13c2585 100644
--- a/lib/private/backgroundjob/joblist.php
+++ b/lib/private/backgroundjob/joblist.php
@@ -31,7 +31,7 @@ class JobList implements IJobList {
 	}
 
 	/**
-	 * @param \Test\BackgroundJob\TestJob $job
+	 * @param Job|string $job
 	 * @param mixed $argument
 	 */
 	public function add($job, $argument = null) {
@@ -48,7 +48,7 @@ class JobList implements IJobList {
 	}
 
 	/**
-	 * @param Job $job
+	 * @param Job|string $job
 	 * @param mixed $argument
 	 */
 	public function remove($job, $argument = null) {
@@ -70,7 +70,7 @@ class JobList implements IJobList {
 	/**
 	 * check if a job is in the list
 	 *
-	 * @param $job
+	 * @param Job|string $job
 	 * @param mixed $argument
 	 * @return bool
 	 */
@@ -126,7 +126,7 @@ class JobList implements IJobList {
 
 	/**
 	 * @param int $id
-	 * @return Job
+	 * @return Job|null
 	 */
 	public function getById($id) {
 		$query = $this->conn->prepare('SELECT `id`, `class`, `last_run`, `argument` FROM `*PREFIX*jobs` WHERE `id` = ?');
diff --git a/lib/private/cache/file.php b/lib/private/cache/file.php
index feee9cc32b..4e7c065678 100644
--- a/lib/private/cache/file.php
+++ b/lib/private/cache/file.php
@@ -48,7 +48,7 @@ class File {
 	/**
 	 * Returns the size of the stored/cached data
 	 *
-	 * @param $key
+	 * @param string $key
 	 * @return int
 	 */
 	public function size($key) {
diff --git a/lib/private/config.php b/lib/private/config.php
index 6701ca0532..82a1c46c9d 100644
--- a/lib/private/config.php
+++ b/lib/private/config.php
@@ -64,8 +64,8 @@ class Config {
 	}
 
 	/**
-	 * @brief Lists all available config keys
-	 * @return array with key names
+	 * Lists all available config keys
+	 * @return array an array of key names
 	 *
 	 * This function returns all keys saved in config.php. Please note that it
 	 * does not return the values.
@@ -75,10 +75,10 @@ class Config {
 	}
 
 	/**
-	 * @brief Gets a value from config.php
+	 * Gets a value from config.php
 	 * @param string $key key
-	 * @param array|bool|string|null $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.
@@ -92,9 +92,9 @@ class Config {
 	}
 
 	/**
-	 * @brief Sets a value
+	 * 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.
 	 *
@@ -108,7 +108,7 @@ class Config {
 	}
 
 	/**
-	 * @brief Removes a key from the config
+	 * Removes a key from the config
 	 * @param string $key key
 	 *
 	 * This function removes a key from the config.php.
@@ -125,7 +125,7 @@ class Config {
 	}
 
 	/**
-	 * @brief Loads the config file
+	 * Loads the config file
 	 *
 	 * Reads the config file and saves it to the cache
 	 */
@@ -153,7 +153,7 @@ class Config {
 	}
 
 	/**
-	 * @brief Writes the config file
+	 * Writes the config file
 	 *
 	 * Saves the config to the config file.
 	 *
diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php
index 5577273df8..9ebf5fc05c 100644
--- a/lib/private/connector/sabre/auth.php
+++ b/lib/private/connector/sabre/auth.php
@@ -69,6 +69,8 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 	  * even if there are no HTTP Basic Auth headers.
 	  * In other case, just fallback to the parent implementation.
 	  *
+	  * @param Sabre_DAV_Server $server
+	  * @param $realm
 	  * @return bool
 	  */
 	public function authenticate(Sabre_DAV_Server $server, $realm) {
diff --git a/lib/private/connector/sabre/exceptionloggerplugin.php b/lib/private/connector/sabre/exceptionloggerplugin.php
index 8e77afaf20..5eaf1e8762 100644
--- a/lib/private/connector/sabre/exceptionloggerplugin.php
+++ b/lib/private/connector/sabre/exceptionloggerplugin.php
@@ -11,6 +11,17 @@
 
 class OC_Connector_Sabre_ExceptionLoggerPlugin extends Sabre_DAV_ServerPlugin
 {
+	private $nonFatalExceptions = array(
+		'Sabre_DAV_Exception_NotAuthenticated' => true,
+		// the sync client uses this to find out whether files exist,
+		// so it is not always an error, log it as debug
+		'Sabre_DAV_Exception_NotFound' => true,
+		// this one mostly happens when the same file is uploaded at
+		// exactly the same time from two clients, only one client
+		// wins, the second one gets "Precondition failed"
+		'Sabre_DAV_Exception_PreconditionFailed' => true,
+	);
+
 	private $appName;
 
 	/**
@@ -43,8 +54,10 @@ class OC_Connector_Sabre_ExceptionLoggerPlugin extends Sabre_DAV_ServerPlugin
 	 */
 	public function logException($e) {
 		$exceptionClass = get_class($e);
-		if ($exceptionClass !== 'Sabre_DAV_Exception_NotAuthenticated') {
-			\OCP\Util::logException($this->appName, $e);
+		$level = \OCP\Util::FATAL;
+		if (isset($this->nonFatalExceptions[$exceptionClass])) {
+			$level = \OCP\Util::DEBUG;
 		}
+		\OCP\Util::logException($this->appName, $e, $level);
 	}
 }
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index 66b50a8755..ab9d3e47d0 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -123,7 +123,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	/**
 	 * Returns the data
 	 *
-	 * @return string | resource
+	 * @return string|resource
 	 */
 	public function get() {
 
diff --git a/lib/private/connector/sabre/filesplugin.php b/lib/private/connector/sabre/filesplugin.php
index 65231040fb..25d7fd5334 100644
--- a/lib/private/connector/sabre/filesplugin.php
+++ b/lib/private/connector/sabre/filesplugin.php
@@ -37,6 +37,7 @@ class OC_Connector_Sabre_FilesPlugin extends Sabre_DAV_ServerPlugin
 
 		$server->xmlNamespaces[self::NS_OWNCLOUD] = 'oc';
 		$server->protectedProperties[] = '{' . self::NS_OWNCLOUD . '}id';
+		$server->protectedProperties[] = '{' . self::NS_OWNCLOUD . '}perm';
 
 		$this->server = $server;
 		$this->server->subscribeEvent('beforeGetProperties', array($this, 'beforeGetProperties'));
@@ -57,15 +58,24 @@ class OC_Connector_Sabre_FilesPlugin extends Sabre_DAV_ServerPlugin
 
 		if ($node instanceof OC_Connector_Sabre_Node) {
 
-			$fileid_propertyname = '{' . self::NS_OWNCLOUD . '}id';
-			if (array_search($fileid_propertyname, $requestedProperties)) {
-				unset($requestedProperties[array_search($fileid_propertyname, $requestedProperties)]);
+			$fileIdPropertyName = '{' . self::NS_OWNCLOUD . '}id';
+			$permissionsPropertyName = '{' . self::NS_OWNCLOUD . '}permissions';
+			if (array_search($fileIdPropertyName, $requestedProperties)) {
+				unset($requestedProperties[array_search($fileIdPropertyName, $requestedProperties)]);
+			}
+			if (array_search($permissionsPropertyName, $requestedProperties)) {
+				unset($requestedProperties[array_search($permissionsPropertyName, $requestedProperties)]);
 			}
 
 			/** @var $node OC_Connector_Sabre_Node */
 			$fileId = $node->getFileId();
 			if (!is_null($fileId)) {
-				$returnedProperties[200][$fileid_propertyname] = $fileId;
+				$returnedProperties[200][$fileIdPropertyName] = $fileId;
+			}
+
+			$permissions = $node->getDavPermissions();
+			if (!is_null($fileId)) {
+				$returnedProperties[200][$permissionsPropertyName] = $permissions;
 			}
 
 		}
@@ -73,7 +83,7 @@ class OC_Connector_Sabre_FilesPlugin extends Sabre_DAV_ServerPlugin
 	}
 
 	/**
-	 * @param $filePath
+	 * @param string $filePath
 	 * @param Sabre_DAV_INode $node
 	 * @throws Sabre_DAV_Exception_BadRequest
 	 */
diff --git a/lib/private/connector/sabre/node.php b/lib/private/connector/sabre/node.php
index eede39cba8..f124b75444 100644
--- a/lib/private/connector/sabre/node.php
+++ b/lib/private/connector/sabre/node.php
@@ -56,7 +56,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	protected $info;
 
 	/**
-	 * @brief Sets up the node, expects a full path name
+	 * Sets up the node, expects a full path name
 	 * @param \OC\Files\View $view
 	 * @param \OCP\Files\FileInfo $info
 	 */
@@ -71,7 +71,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	}
 
 	/**
-	 * @brief  Returns the name of the node
+	 *  Returns the name of the node
 	 * @return string
 	 */
 	public function getName() {
@@ -79,7 +79,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	}
 
 	/**
-	 * @brief Renames the node
+	 * Renames the node
 	 * @param string $name The new name
 	 * @throws Sabre_DAV_Exception_BadRequest
 	 * @throws Sabre_DAV_Exception_Forbidden
@@ -116,7 +116,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	}
 
 	/**
-	 * @brief Returns the last modification time, as a unix timestamp
+	 * Returns the last modification time, as a unix timestamp
 	 * @return int timestamp as integer
 	 */
 	public function getLastModified() {
@@ -138,7 +138,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	}
 
 	/**
-	 * @brief Updates properties on this node,
+	 * Updates properties on this node,
 	 * @see Sabre_DAV_IProperties::updateProperties
 	 * @param array $properties
 	 * @return boolean
@@ -188,7 +188,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	}
 
 	/**
-	 * @brief Returns a list of properties for this nodes.;
+	 * Returns a list of properties for this nodes.;
 	 * @param array $properties
 	 * @return array
 	 * @note The properties list is a list of propertynames the client
@@ -237,4 +237,36 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 
 		return null;
 	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getDavPermissions() {
+		$p ='';
+		if ($this->info->isShared()) {
+			$p .= 'S';
+		}
+		if ($this->info->isShareable()) {
+			$p .= 'R';
+		}
+		if ($this->info->isMounted()) {
+			$p .= 'M';
+		}
+		if ($this->info->isDeletable()) {
+			$p .= 'D';
+		}
+		if ($this->info->isDeletable()) {
+			$p .= 'N';
+		}
+		if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) {
+			if ($this->info->isUpdateable()) {
+				$p .= 'W';
+			}
+		} else {
+			if ($this->info->isUpdateable()) {
+				$p .= 'CK';
+			}
+		}
+		return $p;
+	}
 }
diff --git a/lib/private/connector/sabre/quotaplugin.php b/lib/private/connector/sabre/quotaplugin.php
index 1e73e1645c..c9b8336b57 100644
--- a/lib/private/connector/sabre/quotaplugin.php
+++ b/lib/private/connector/sabre/quotaplugin.php
@@ -97,7 +97,7 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin {
 	}
 
 	/**
-	 * @param $parentUri
+	 * @param string $parentUri
 	 * @return mixed
 	 */
 	public function getFreeSpace($parentUri) {
diff --git a/lib/private/contactsmanager.php b/lib/private/contactsmanager.php
index 8cfbb3da9f..338cc04865 100644
--- a/lib/private/contactsmanager.php
+++ b/lib/private/contactsmanager.php
@@ -31,7 +31,7 @@ namespace OC {
 		 * @param string $pattern which should match within the $searchProperties
 		 * @param array $searchProperties defines the properties within the query pattern should match
 		 * @param array $options - for future use. One should always have options!
-		 * @return array of contacts which are arrays of key-value-pairs
+		 * @return array an array of contacts which are arrays of key-value-pairs
 		 */
 		public function search($pattern, $searchProperties = array(), $options = array()) {
 			$this->loadAddressBooks();
diff --git a/lib/private/davclient.php b/lib/private/davclient.php
index 916dc11d17..a7bf048651 100644
--- a/lib/private/davclient.php
+++ b/lib/private/davclient.php
@@ -32,7 +32,7 @@ class OC_DAVClient extends \Sabre_DAV_Client {
 	protected $verifyHost;
 
 	/**
-	 * @brief Sets the request timeout or 0 to disable timeout.
+	 * Sets the request timeout or 0 to disable timeout.
 	 * @param integer $timeout in seconds or 0 to disable
 	 */
 	public function setRequestTimeout($timeout) {
@@ -40,7 +40,7 @@ class OC_DAVClient extends \Sabre_DAV_Client {
 	}
 
 	/**
-	 * @brief Sets the CURLOPT_SSL_VERIFYHOST setting
+	 * Sets the CURLOPT_SSL_VERIFYHOST setting
 	 * @param integer $value value to set CURLOPT_SSL_VERIFYHOST to
 	*/
 	public function setVerifyHost($value) {
diff --git a/lib/private/db.php b/lib/private/db.php
index 322a13642a..df9d1aeca3 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -50,7 +50,7 @@ class OC_DB {
 	static private $type=null;
 
 	/**
-	 * @brief connects to the database
+	 * connects to the database
 	 * @return boolean|null true if connection can be established or false on error
 	 *
 	 * Connects to the database as specified in config.php
@@ -72,102 +72,45 @@ class OC_DB {
 			$port=false;
 		}
 
-		// do nothing if the connection already has been established
-		if (!self::$connection) {
-			$config = new \Doctrine\DBAL\Configuration();
-			$eventManager = new \Doctrine\Common\EventManager();
-			switch($type) {
-				case 'sqlite':
-				case 'sqlite3':
-					$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
-					$connectionParams = array(
-							'user' => $user,
-							'password' => $pass,
-							'path' => $datadir.'/'.$name.'.db',
-							'driver' => 'pdo_sqlite',
-					);
-					$connectionParams['adapter'] = '\OC\DB\AdapterSqlite';
-					$connectionParams['wrapperClass'] = 'OC\DB\Connection';
-					break;
-				case 'mysql':
-					$connectionParams = array(
-							'user' => $user,
-							'password' => $pass,
-							'host' => $host,
-							'port' => $port,
-							'dbname' => $name,
-							'charset' => 'UTF8',
-							'driver' => 'pdo_mysql',
-					);
-					$connectionParams['adapter'] = '\OC\DB\Adapter';
-					$connectionParams['wrapperClass'] = 'OC\DB\Connection';
-					// Send "SET NAMES utf8". Only required on PHP 5.3 below 5.3.6.
-					// See http://stackoverflow.com/questions/4361459/php-pdo-charset-set-names#4361485
-					$eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\MysqlSessionInit);
-					break;
-				case 'pgsql':
-					$connectionParams = array(
-							'user' => $user,
-							'password' => $pass,
-							'host' => $host,
-							'port' => $port,
-							'dbname' => $name,
-							'driver' => 'pdo_pgsql',
-					);
-					$connectionParams['adapter'] = '\OC\DB\AdapterPgSql';
-					$connectionParams['wrapperClass'] = 'OC\DB\Connection';
-					break;
-				case 'oci':
-					$connectionParams = array(
-							'user' => $user,
-							'password' => $pass,
-							'host' => $host,
-							'dbname' => $name,
-							'charset' => 'AL32UTF8',
-							'driver' => 'oci8',
-					);
-					if (!empty($port)) {
-						$connectionParams['port'] = $port;
-					}
-					$connectionParams['adapter'] = '\OC\DB\AdapterOCI8';
-					$connectionParams['wrapperClass'] = 'OC\DB\OracleConnection';
-					$eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\OracleSessionInit);
-					break;
-				case 'mssql':
-					$connectionParams = array(
-							'user' => $user,
-							'password' => $pass,
-							'host' => $host,
-							'port' => $port,
-							'dbname' => $name,
-							'charset' => 'UTF8',
-							'driver' => 'pdo_sqlsrv',
-					);
-					$connectionParams['adapter'] = '\OC\DB\AdapterSQLSrv';
-					$connectionParams['wrapperClass'] = 'OC\DB\Connection';
-					break;
-				default:
-					return false;
-			}
-			$connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_' );
-			try {
-				self::$connection = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config, $eventManager);
-				if ($type === 'sqlite' || $type === 'sqlite3') {
-					// Sqlite doesn't handle query caching and schema changes
-					// TODO: find a better way to handle this
-					self::$connection->disableQueryStatementCaching();
-				}
-			} catch(\Doctrine\DBAL\DBALException $e) {
-				OC_Log::write('core', $e->getMessage(), OC_Log::FATAL);
-				OC_User::setUserId(null);
+		$factory = new \OC\DB\ConnectionFactory();
+		if (!$factory->isValidType($type)) {
+			return false;
+		}
 
-				// send http status 503
-				header('HTTP/1.1 503 Service Temporarily Unavailable');
-				header('Status: 503 Service Temporarily Unavailable');
-				OC_Template::printErrorPage('Failed to connect to database');
-				die();
+		if ($factory->normalizeType($type) === 'sqlite3') {
+			$datadir = OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data');
+			$connectionParams = array(
+				'user' => $user,
+				'password' => $pass,
+				'path' => $datadir.'/'.$name.'.db',
+			);
+		} else {
+			$connectionParams = array(
+				'user' => $user,
+				'password' => $pass,
+				'host' => $host,
+				'dbname' => $name,
+			);
+			if (!empty($port)) {
+				$connectionParams['port'] = $port;
 			}
 		}
+
+		$connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_');
+
+		try {
+			self::$connection = $factory->getConnection($type, $connectionParams);
+		} catch(\Doctrine\DBAL\DBALException $e) {
+			OC_Log::write('core', $e->getMessage(), OC_Log::FATAL);
+			OC_User::setUserId(null);
+
+			// send http status 503
+			header('HTTP/1.1 503 Service Temporarily Unavailable');
+			header('Status: 503 Service Temporarily Unavailable');
+			OC_Template::printErrorPage('Failed to connect to database');
+			die();
+		}
+
 		return true;
 	}
 
@@ -190,7 +133,7 @@ class OC_DB {
 	}
 
 	/**
-	 * @brief Prepare a SQL query
+	 * Prepare a SQL query
 	 * @param string $query Query string
 	 * @param int $limit
 	 * @param int $offset
@@ -202,12 +145,12 @@ class OC_DB {
 	 */
 	static public function prepare( $query , $limit = null, $offset = null, $isManipulation = null) {
 		self::connect();
-		
+
 		if ($isManipulation === null) {
 			//try to guess, so we return the number of rows on manipulations
 			$isManipulation = self::isManipulation($query);
 		}
-		
+
 		// return the result
 		try {
 			$result = self::$connection->prepare($query, $limit, $offset);
@@ -222,7 +165,7 @@ class OC_DB {
 	/**
 	 * tries to guess the type of statement based on the first 10 characters
 	 * the current check allows some whitespace but does not work with IF EXISTS or other more complex statements
-	 * 
+	 *
 	 * @param string $sql
 	 * @return bool
 	 */
@@ -245,9 +188,9 @@ class OC_DB {
 		}
 		return false;
 	}
-	
+
 	/**
-	 * @brief execute a prepared statement, on error write log and throw exception
+	 * execute a prepared statement, on error write log and throw exception
 	 * @param mixed $stmt OC_DB_StatementWrapper,
 	 *					  an array with 'sql' and optionally 'limit' and 'offset' keys
 	 *					.. or a simple sql query string
@@ -296,7 +239,7 @@ class OC_DB {
 	}
 
 	/**
-	 * @brief gets last value of autoincrement
+	 * gets last value of autoincrement
 	 * @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix
 	 * @return string id
 	 * @throws DatabaseException
@@ -312,7 +255,7 @@ class OC_DB {
 	}
 
 	/**
-	 * @brief Insert a row if a matching row doesn't exists.
+	 * Insert a row if a matching row doesn't exists.
 	 * @param string $table The table to insert into in the form '*PREFIX*tableName'
 	 * @param array $input An array of fieldname/value pairs
 	 * @return boolean number of updated rows
@@ -339,7 +282,7 @@ class OC_DB {
 	}
 
 	/**
-	 * @brief saves database schema to xml file
+	 * saves database schema to xml file
 	 * @param string $file name of file
 	 * @param int $mode
 	 * @return bool
@@ -352,7 +295,7 @@ class OC_DB {
 	}
 
 	/**
-	 * @brief Creates tables from XML file
+	 * Creates tables from XML file
 	 * @param string $file file to read structure from
 	 * @return bool
 	 *
@@ -365,7 +308,7 @@ class OC_DB {
 	}
 
 	/**
-	 * @brief update the database schema
+	 * update the database schema
 	 * @param string $file file to read structure from
 	 * @throws Exception
 	 * @return string|boolean
@@ -382,7 +325,7 @@ class OC_DB {
 	}
 
 	/**
-	 * @brief drop a table
+	 * drop a table
 	 * @param string $tableName the table to drop
 	 */
 	public static function dropTable($tableName) {
@@ -400,8 +343,8 @@ class OC_DB {
 	}
 
 	/**
-	 * @brief replaces the ownCloud tables with a new set
-	 * @param $file string path to the MDB2 xml db export file
+	 * replaces the ownCloud tables with a new set
+	 * @param string $file path to the MDB2 xml db export file
 	 */
 	public static function replaceDB( $file ) {
 		$schemaManager = self::getMDB2SchemaManager();
diff --git a/lib/private/db/adapter.php b/lib/private/db/adapter.php
index 6b31f37dd9..975b943228 100644
--- a/lib/private/db/adapter.php
+++ b/lib/private/db/adapter.php
@@ -40,7 +40,7 @@ class Adapter {
 	}
 
 	/**
-	 * @brief insert the @input values when they do not exist yet
+	 * insert the @input values when they do not exist yet
 	 * @param string $table name
 	 * @param array $input key->value pairs
 	 * @return int count of inserted rows
diff --git a/lib/private/db/connection.php b/lib/private/db/connection.php
index 2bd7b09302..b7981fcd69 100644
--- a/lib/private/db/connection.php
+++ b/lib/private/db/connection.php
@@ -152,7 +152,7 @@ class Connection extends \Doctrine\DBAL\Connection {
 	}
 
 	/**
-	 * @brief Insert a row if a matching row doesn't exists.
+	 * Insert a row if a matching row doesn't exists.
 	 * @param string $table. The table to insert into in the form '*PREFIX*tableName'
 	 * @param array $input. An array of fieldname/value pairs
 	 * @return bool The return value from execute()
diff --git a/lib/private/db/connectionfactory.php b/lib/private/db/connectionfactory.php
new file mode 100644
index 0000000000..8f852cf712
--- /dev/null
+++ b/lib/private/db/connectionfactory.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright (c) 2014 Andreas Fischer <bantu@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\DB;
+
+/**
+* Takes care of creating and configuring Doctrine connections.
+*/
+class ConnectionFactory {
+	/**
+	* @var array
+	*
+	* Array mapping DBMS type to default connection parameters passed to
+	* \Doctrine\DBAL\DriverManager::getConnection().
+	*/
+	protected $defaultConnectionParams = array(
+		'mssql' => array(
+			'adapter' => '\OC\DB\AdapterSQLSrv',
+			'charset' => 'UTF8',
+			'driver' => 'pdo_sqlsrv',
+			'wrapperClass' => 'OC\DB\Connection',
+		),
+		'mysql' => array(
+			'adapter' => '\OC\DB\Adapter',
+			'charset' => 'UTF8',
+			'driver' => 'pdo_mysql',
+			'wrapperClass' => 'OC\DB\Connection',
+		),
+		'oci' => array(
+			'adapter' => '\OC\DB\AdapterOCI8',
+			'charset' => 'AL32UTF8',
+			'driver' => 'oci8',
+			'wrapperClass' => 'OC\DB\OracleConnection',
+		),
+		'pgsql' => array(
+			'adapter' => '\OC\DB\AdapterPgSql',
+			'driver' => 'pdo_pgsql',
+			'wrapperClass' => 'OC\DB\Connection',
+		),
+		'sqlite3' => array(
+			'adapter' => '\OC\DB\AdapterSqlite',
+			'driver' => 'pdo_sqlite',
+			'wrapperClass' => 'OC\DB\Connection',
+		),
+	);
+
+	/**
+	* @brief Get default connection parameters for a given DBMS.
+	* @param string $type DBMS type
+	* @throws \InvalidArgumentException If $type is invalid
+	* @return array Default connection parameters.
+	*/
+	public function getDefaultConnectionParams($type) {
+		$normalizedType = $this->normalizeType($type);
+		if (!isset($this->defaultConnectionParams[$normalizedType])) {
+			throw new \InvalidArgumentException("Unsupported type: $type");
+		}
+		return $this->defaultConnectionParams[$normalizedType];
+	}
+
+	/**
+	* @brief Get default connection parameters for a given DBMS.
+	* @param string $type DBMS type
+	* @param array $additionalConnectionParams Additional connection parameters
+	* @return \OC\DB\Connection
+	*/
+	public function getConnection($type, $additionalConnectionParams) {
+		$normalizedType = $this->normalizeType($type);
+		$eventManager = new \Doctrine\Common\EventManager();
+		switch ($normalizedType) {
+			case 'mysql':
+				// Send "SET NAMES utf8". Only required on PHP 5.3 below 5.3.6.
+				// See http://stackoverflow.com/questions/4361459/php-pdo-charset-set-names#4361485
+				$eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\MysqlSessionInit);
+				break;
+			case 'oci':
+				$eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\OracleSessionInit);
+				break;
+		}
+		$connection = \Doctrine\DBAL\DriverManager::getConnection(
+			array_merge($this->getDefaultConnectionParams($type), $additionalConnectionParams),
+			new \Doctrine\DBAL\Configuration(),
+			$eventManager
+		);
+		switch ($normalizedType) {
+			case 'sqlite3':
+				// Sqlite doesn't handle query caching and schema changes
+				// TODO: find a better way to handle this
+				/** @var $connection \OC\DB\Connection */
+				$connection->disableQueryStatementCaching();
+				break;
+		}
+		return $connection;
+	}
+
+	/**
+	* @brief Normalize DBMS type
+	* @param string $type DBMS type
+	* @return string Normalized DBMS type
+	*/
+	public function normalizeType($type) {
+		return $type === 'sqlite' ? 'sqlite3' : $type;
+	}
+
+	/**
+	* @brief Checks whether the specified DBMS type is valid.
+	* @return bool
+	*/
+	public function isValidType($type) {
+		$normalizedType = $this->normalizeType($type);
+		return isset($this->defaultConnectionParams[$normalizedType]);
+	}
+}
diff --git a/lib/private/db/connectionwrapper.php b/lib/private/db/connectionwrapper.php
index c2cfc21d20..132e76666a 100644
--- a/lib/private/db/connectionwrapper.php
+++ b/lib/private/db/connectionwrapper.php
@@ -41,8 +41,8 @@ class ConnectionWrapper implements \OCP\IDBConnection {
 
 	/**
 	 * Insert a row if a matching row doesn't exists.
-	 * @param string The table name (will replace *PREFIX*) to perform the replace on.
-	 * @param array
+	 * @param string $table The table name (will replace *PREFIX*) to perform the replace on.
+	 * @param array $input
 	 *
 	 * The input array if in the form:
 	 *
diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php
index aaf2ea543b..1e90c8bda5 100644
--- a/lib/private/db/mdb2schemamanager.php
+++ b/lib/private/db/mdb2schemamanager.php
@@ -24,7 +24,7 @@ class MDB2SchemaManager {
 	}
 
 	/**
-	 * @brief saves database scheme to xml file
+	 * saves database scheme to xml file
 	 * @param string $file name of file
 	 * @param int|string $mode
 	 * @return bool
@@ -38,7 +38,7 @@ class MDB2SchemaManager {
 	}
 
 	/**
-	 * @brief Creates tables from XML file
+	 * Creates tables from XML file
 	 * @param string $file file to read structure from
 	 * @return bool
 	 *
@@ -51,7 +51,7 @@ class MDB2SchemaManager {
 	}
 
 	/**
-	 * @brief update the database scheme
+	 * update the database scheme
 	 * @param string $file file to read structure from
 	 * @return string|boolean
 	 */
@@ -86,7 +86,7 @@ class MDB2SchemaManager {
 				$column->oldColumnName = $platform->quoteIdentifier($column->oldColumnName);
 			}
 		}
-		
+
 		if ($generateSql) {
 			return $this->generateChangeScript($schemaDiff);
 		}
@@ -95,7 +95,7 @@ class MDB2SchemaManager {
 	}
 
 	/**
-	 * @brief drop a table
+	 * drop a table
 	 * @param string $tableName the table to drop
 	 */
 	public function dropTable($tableName) {
@@ -125,8 +125,8 @@ class MDB2SchemaManager {
 	}
 
 	/**
-	 * @brief replaces the ownCloud tables with a new set
-	 * @param $file string path to the MDB2 xml db export file
+	 * replaces the ownCloud tables with a new set
+	 * @param string $file path to the MDB2 xml db export file
 	 */
 	public function replaceDB( $file ) {
 		$apps = \OC_App::getAllApps();
diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php
index 1c16d03eab..597650985f 100644
--- a/lib/private/db/mdb2schemareader.php
+++ b/lib/private/db/mdb2schemareader.php
@@ -66,7 +66,7 @@ class MDB2SchemaReader {
 	}
 
 	/**
-	 * @param\Doctrine\DBAL\Schema\Schema $schema
+	 * @param \Doctrine\DBAL\Schema\Schema $schema
 	 * @param \SimpleXMLElement $xml
 	 * @throws \DomainException
 	 */
@@ -303,7 +303,7 @@ class MDB2SchemaReader {
 	}
 
 	/**
-	 * @param \SimpleXMLElement | string $xml
+	 * @param \SimpleXMLElement|string $xml
 	 * @return bool
 	 */
 	private function asBool($xml) {
diff --git a/lib/private/db/pgsqltools.php b/lib/private/db/pgsqltools.php
new file mode 100644
index 0000000000..c3ac140594
--- /dev/null
+++ b/lib/private/db/pgsqltools.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * Copyright (c) 2014 Andreas Fischer <bantu@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\DB;
+
+/**
+* Various PostgreSQL specific helper functions.
+*/
+class PgSqlTools {
+	/**
+	* @brief Resynchronizes all sequences of a database after using INSERTs
+	*        without leaving out the auto-incremented column.
+	* @param \OC\DB\Connection $conn
+	* @return null
+	*/
+	public function resynchronizeDatabaseSequences(Connection $conn) {
+		$databaseName = $conn->getDatabase();
+		foreach ($conn->getSchemaManager()->listSequences() as $sequence) {
+			$sequenceName = $sequence->getName();
+			$sqlInfo = 'SELECT table_schema, table_name, column_name
+				FROM information_schema.columns
+				WHERE column_default = ? AND table_catalog = ?';
+			$sequenceInfo = $conn->fetchAssoc($sqlInfo, array(
+				"nextval('$sequenceName'::regclass)",
+				$databaseName
+			));
+			$tableName = $sequenceInfo['table_name'];
+			$columnName = $sequenceInfo['column_name'];
+			$sqlMaxId = "SELECT MAX($columnName) FROM $tableName";
+			$sqlSetval = "SELECT setval('$sequenceName', ($sqlMaxId))";
+			$conn->executeQuery($sqlSetval);
+		}
+	}
+}
diff --git a/lib/private/db/statementwrapper.php b/lib/private/db/statementwrapper.php
index 492209b883..70d1f985a4 100644
--- a/lib/private/db/statementwrapper.php
+++ b/lib/private/db/statementwrapper.php
@@ -41,7 +41,7 @@ class OC_DB_StatementWrapper {
 	 * make execute return the result instead of a bool
 	 *
 	 * @param array $input
-	 * @return \OC_DB_StatementWrapper | int
+	 * @return \OC_DB_StatementWrapper|int
 	 */
 	public function execute($input=array()) {
 		if(OC_Config::getValue( "log_query", false)) {
diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index fca798568c..663c327a3b 100644
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -185,7 +185,7 @@ class OC_Defaults {
 
 	/**
 	 * Returns mail header color
-	 * @return mail header color
+	 * @return string
 	 */
 	public function getMailHeaderColor() {
 		if ($this->themeExist('getMailHeaderColor')) {
diff --git a/lib/private/fileproxy.php b/lib/private/fileproxy.php
index 88976c1b8e..2835e97464 100644
--- a/lib/private/fileproxy.php
+++ b/lib/private/fileproxy.php
@@ -47,7 +47,7 @@ class OC_FileProxy{
 	/**
 	 * fallback function when a proxy operation is not implemented
 	 * @param string $function the name of the proxy operation
-	 * @param mixed
+	 * @param mixed $arguments
 	 *
 	 * this implements a dummy proxy for all operations
 	 */
diff --git a/lib/private/files.php b/lib/private/files.php
index 152595ba69..7c437a16a9 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -152,7 +152,7 @@ class OC_Files {
 				/** @var $storage \OC\Files\Storage\Storage */
 				list($storage) = $view->resolvePath($filename);
 				if ($storage->isLocal()) {
-					self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename));
+					self::addSendfileHeader($filename);
 				} else {
 					\OC\Files\Filesystem::readfile($filename);
 				}
@@ -167,9 +167,11 @@ class OC_Files {
 	 */
 	private static function addSendfileHeader($filename) {
 		if (isset($_SERVER['MOD_X_SENDFILE_ENABLED'])) {
+			$filename = \OC\Files\Filesystem::getLocalFile($filename);
 			header("X-Sendfile: " . $filename);
  		}
  		if (isset($_SERVER['MOD_X_SENDFILE2_ENABLED'])) {
+			$filename = \OC\Files\Filesystem::getLocalFile($filename);
 			if (isset($_SERVER['HTTP_RANGE']) &&
 				preg_match("/^bytes=([0-9]+)-([0-9]*)$/", $_SERVER['HTTP_RANGE'], $range)) {
 				$filelength = filesize($filename);
@@ -185,6 +187,7 @@ class OC_Files {
 		}
 
 		if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) {
+			$filename = \OC::$WEBROOT . '/data' . \OC\Files\Filesystem::getRoot() . $filename;
 			header("X-Accel-Redirect: " . $filename);
 		}
 	}
@@ -222,7 +225,7 @@ class OC_Files {
 	 * checks if the selected files are within the size constraint. If not, outputs an error page.
 	 *
 	 * @param string $dir
-	 * @param array | string $files
+	 * @param array|string $files
 	 */
 	static function validateZipDownload($dir, $files) {
 		if (!OC_Config::getValue('allowZipDownload', true)) {
@@ -279,9 +282,7 @@ class OC_Files {
 				return false;
 			$size -= 1;
 		} else {
-			$size = OC_Helper::humanFileSize($size);
-			$size = substr($size, 0, -1); //strip the B
-			$size = str_replace(' ', '', $size); //remove the space between the size and the postfix
+			$size = OC_Helper::phpFileSize($size);
 		}
 
 		//don't allow user to break his config -- broken or malicious size input
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index 1c9de56f8c..3e4f6dfb13 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -109,7 +109,7 @@ class Cache {
 	 * get the stored metadata of a file or folder
 	 *
 	 * @param string/int $file
-	 * @return array | false
+	 * @return array|false
 	 */
 	public function get($file) {
 		if (is_string($file) or $file == '') {
@@ -450,7 +450,7 @@ class Cache {
 	 * search for files matching $pattern
 	 *
 	 * @param string $pattern
-	 * @return array of file data
+	 * @return array an array of file data
 	 */
 	public function search($pattern) {
 
@@ -597,12 +597,16 @@ class Cache {
 	 * get the path of a file on this storage by it's id
 	 *
 	 * @param int $id
-	 * @return string | null
+	 * @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()) {
+			// Oracle stores empty strings as null...
+			if ($row['path'] === null) {
+				return '';
+			}
 			return $row['path'];
 		} else {
 			return null;
@@ -636,7 +640,7 @@ class Cache {
 
 	/**
 	 * normalize the given path
-	 * @param $path
+	 * @param string $path
 	 * @return string
 	 */
 	public function normalize($path) {
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index c0bdde06a7..b3ab94f459 100644
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -61,7 +61,7 @@ class Scanner extends BasicEmitter {
 	 * *
 	 *
 	 * @param string $path
-	 * @return array with metadata of the file
+	 * @return array an array of metadata of the file
 	 */
 	public function getData($path) {
 		if (!$this->storage->isReadable($path)) {
@@ -88,7 +88,7 @@ class Scanner extends BasicEmitter {
 	 * @param string $file
 	 * @param int $reuseExisting
 	 * @param bool $parentExistsInCache
-	 * @return array with metadata of the scanned file
+	 * @return array an array of metadata of the scanned file
 	 */
 	public function scanFile($file, $reuseExisting = 0, $parentExistsInCache = false) {
 		if (!self::isPartialFile($file)
@@ -174,7 +174,7 @@ class Scanner extends BasicEmitter {
 	 * @param string $path
 	 * @param bool $recursive
 	 * @param int $reuse
-	 * @return array with the meta data of the scanned file or folder
+	 * @return array an array of the meta data of the scanned file or folder
 	 */
 	public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1) {
 		if ($reuse === -1) {
@@ -270,10 +270,10 @@ class Scanner extends BasicEmitter {
 	}
 
 	/**
-	 * @brief check if the file should be ignored when scanning
+	 * check if the file should be ignored when scanning
 	 * NOTE: files with a '.part' extension are ignored as well!
 	 *       prevents unfinished put requests to be scanned
-	 * @param String $file
+	 * @param string $file
 	 * @return boolean
 	 */
 	public static function isPartialFile($file) {
diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php
index 199ce5dee7..f6feb6624b 100644
--- a/lib/private/files/cache/updater.php
+++ b/lib/private/files/cache/updater.php
@@ -17,7 +17,7 @@ class Updater {
 	 * resolve a path to a storage and internal path
 	 *
 	 * @param string $path the relative path
-	 * @return array consisting of the storage and the internal path
+	 * @return array an array consisting of the storage and the internal path
 	 */
 	static public function resolvePath($path) {
 		$view = \OC\Files\Filesystem::getView();
@@ -108,7 +108,7 @@ class Updater {
 	}
 
 	/**
-	 * @brief get file owner and path
+	 * get file owner and path
 	 * @param string $filename
 	 * @return string[] with the oweners uid and the owners path
 	 */
diff --git a/lib/private/files/cache/watcher.php b/lib/private/files/cache/watcher.php
index 48aa6f853c..599752a6ef 100644
--- a/lib/private/files/cache/watcher.php
+++ b/lib/private/files/cache/watcher.php
@@ -55,7 +55,7 @@ class Watcher {
 	 * check $path for updates
 	 *
 	 * @param string $path
-	 * @return boolean | array true if path was updated, otherwise the cached data is returned
+	 * @return boolean|array true if path was updated, otherwise the cached data is returned
 	 */
 	public function checkUpdate($path) {
 		if ($this->watchPolicy === self::CHECK_ALWAYS or ($this->watchPolicy === self::CHECK_ONCE and array_search($path, $this->checkedPaths) === false)) {
diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php
index d6940f50bf..e7afeb4ccc 100644
--- a/lib/private/files/fileinfo.php
+++ b/lib/private/files/fileinfo.php
@@ -147,7 +147,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
 	}
 
 	/**
-	 * @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER
+	 * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
 	 */
 	public function getType() {
 		if (isset($this->data['type'])) {
@@ -196,4 +196,28 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
 	public function isShareable() {
 		return $this->checkPermissions(\OCP\PERMISSION_SHARE);
 	}
+
+	/**
+	 * Check if a file or folder is shared
+	 * @return bool
+	 */
+	public function isShared() {
+		$sid = $this->getStorage()->getId();
+		if (!is_null($sid)) {
+			$sid = explode(':', $sid);
+			return ($sid[0] === 'shared');
+		}
+
+		return false;
+	}
+
+	public function isMounted() {
+		$sid = $this->getStorage()->getId();
+		if (!is_null($sid)) {
+			$sid = explode(':', $sid);
+			return ($sid[0] !== 'local' and $sid[0] !== 'home');
+		}
+
+		return false;
+	}
 }
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index 434ee49587..ad7213d236 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -118,6 +118,22 @@ class Filesystem {
 	 */
 	const signal_post_write = 'post_write';
 
+	/**
+	 * signal emitted before file/dir update
+	 *
+	 * @param string $path
+	 * @param bool $run changing this flag to false in hook handler will cancel event
+	 */
+	const signal_update = 'update';
+
+	/**
+	 * signal emitted after file/dir update
+	 *
+	 * @param string $path
+	 * @param bool $run changing this flag to false in hook handler will cancel event
+	 */
+	const signal_post_update = 'post_update';
+
 	/**
 	 * signal emits when reading file/dir
 	 *
@@ -229,7 +245,7 @@ class Filesystem {
 	}
 
 	/**
-	 * @param $id
+	 * @param string $id
 	 * @return Mount\Mount[]
 	 */
 	public static function getMountByStorageId($id) {
@@ -240,7 +256,7 @@ class Filesystem {
 	}
 
 	/**
-	 * @param $id
+	 * @param int $id
 	 * @return Mount\Mount[]
 	 */
 	public static function getMountByNumericId($id) {
@@ -254,7 +270,7 @@ class Filesystem {
 	 * resolve a path to a storage and internal path
 	 *
 	 * @param string $path
-	 * @return array consisting of the storage and the internal path
+	 * @return array an array consisting of the storage and the internal path
 	 */
 	static public function resolvePath($path) {
 		if (!self::$mounts) {
@@ -368,7 +384,7 @@ class Filesystem {
 	}
 
 	/**
-	 * @brief get the relative path of the root data directory for the current user
+	 * get the relative path of the root data directory for the current user
 	 * @return string
 	 *
 	 * Returns path like /admin/files
@@ -486,7 +502,7 @@ class Filesystem {
 	}
 
 	/**
-	 * @brief check if the directory should be ignored when scanning
+	 * check if the directory should be ignored when scanning
 	 * NOTE: the special directories . and .. would cause never ending recursion
 	 * @param String $dir
 	 * @return boolean
@@ -646,7 +662,7 @@ class Filesystem {
 	}
 
 	/**
-	 * @brief Fix common problems with a file path
+	 * Fix common problems with a file path
 	 * @param string $path
 	 * @param bool $stripTrailingSlash
 	 * @return string
diff --git a/lib/private/files/mapper.php b/lib/private/files/mapper.php
index 833d4bd8d1..666719da12 100644
--- a/lib/private/files/mapper.php
+++ b/lib/private/files/mapper.php
@@ -97,8 +97,8 @@ class Mapper
 	}
 
 	/**
-	 * @param $path
-	 * @param $root
+	 * @param string $path
+	 * @param string $root
 	 * @return false|string
 	 */
 	public function stripRootFolder($path, $root) {
diff --git a/lib/private/files/mount/manager.php b/lib/private/files/mount/manager.php
index 91460b7273..db1f4600c7 100644
--- a/lib/private/files/mount/manager.php
+++ b/lib/private/files/mount/manager.php
@@ -33,7 +33,7 @@ class Manager {
 	/**
 	 * Find the mount for $path
 	 *
-	 * @param $path
+	 * @param string $path
 	 * @return Mount
 	 */
 	public function find($path) {
@@ -61,7 +61,7 @@ class Manager {
 	/**
 	 * Find all mounts in $path
 	 *
-	 * @param $path
+	 * @param string $path
 	 * @return Mount[]
 	 */
 	public function findIn($path) {
@@ -112,7 +112,7 @@ class Manager {
 	/**
 	 * Find mounts by numeric storage id
 	 *
-	 * @param string $id
+	 * @param int $id
 	 * @return Mount[]
 	 */
 	public function findByNumericId($id) {
diff --git a/lib/private/files/mount/mount.php b/lib/private/files/mount/mount.php
index 08d5ddf348..256630726d 100644
--- a/lib/private/files/mount/mount.php
+++ b/lib/private/files/mount/mount.php
@@ -28,7 +28,7 @@ class Mount {
 	private $loader;
 
 	/**
-	 * @param string | \OC\Files\Storage\Storage $storage
+	 * @param string|\OC\Files\Storage\Storage $storage
 	 * @param string $mountpoint
 	 * @param array $arguments (optional)\
 	 * @param \OC\Files\Storage\Loader $loader
diff --git a/lib/private/files/node/folder.php b/lib/private/files/node/folder.php
index d9e0ddc2d6..1af34fc2be 100644
--- a/lib/private/files/node/folder.php
+++ b/lib/private/files/node/folder.php
@@ -296,7 +296,7 @@ class Folder extends Node implements \OCP\Files\Folder {
 	}
 
 	/**
-	 * @param $id
+	 * @param int $id
 	 * @return \OC\Files\Node\Node[]
 	 */
 	public function getById($id) {
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index 8a263d4ce1..fef33cabd8 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -317,7 +317,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	 * clean a path, i.e. remove all redundant '.' and '..'
 	 * making sure that it can't point to higher than '/'
 	 *
-	 * @param $path The path to clean
+	 * @param string $path The path to clean
 	 * @return string cleaned path
 	 */
 	public function cleanPath($path) {
@@ -347,7 +347,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	/**
 	 * get the free space in the storage
 	 *
-	 * @param $path
+	 * @param string $path
 	 * @return int
 	 */
 	public function free_space($path) {
diff --git a/lib/private/files/storage/home.php b/lib/private/files/storage/home.php
index 1c2a682f19..f66096f6d9 100644
--- a/lib/private/files/storage/home.php
+++ b/lib/private/files/storage/home.php
@@ -23,7 +23,7 @@ class Home extends Local {
 	protected $user;
 
 	/**
-	 * @brief Construct a Home storage instance
+	 * Construct a Home storage instance
 	 * @param array $arguments array with "user" containing the
 	 * storage owner and "legacy" containing "true" if the storage is
 	 * a legacy storage with "local::" URL instead of the new "home::" one.
@@ -57,7 +57,7 @@ class Home extends Local {
 	}
 
 	/**
-	 * @brief Returns the owner of this home storage
+	 * Returns the owner of this home storage
 	 * @return \OC\User\User owner of this home storage
 	 */
 	public function getUser() {
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index ff2949d33b..de940fc7cd 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -44,17 +44,26 @@ if (\OC_Util::runningOnWindows()) {
 					new \RecursiveDirectoryIterator($this->datadir . $path),
 					\RecursiveIteratorIterator::CHILD_FIRST
 				);
-				foreach ($it as $file) {
+				/**
+				 * RecursiveDirectoryIterator on an NFS path isn't iterable with foreach
+				 * This bug is fixed in PHP 5.5.9 or before
+				 * See #8376
+				 */
+				$it->rewind();
+				while ($it->valid()) {
 					/**
 					 * @var \SplFileInfo $file
 					 */
+					$file = $it->current();
 					if (in_array($file->getBasename(), array('.', '..'))) {
+						$it->next();
 						continue;
 					} elseif ($file->isDir()) {
 						rmdir($file->getPathname());
 					} elseif ($file->isFile() || $file->isLink()) {
 						unlink($file->getPathname());
 					}
+					$it->next();
 				}
 				return rmdir($this->datadir . $path);
 			} catch (\UnexpectedValueException $e) {
diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index 75582fd6c8..0769166164 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -39,17 +39,26 @@ class MappedLocal extends \OC\Files\Storage\Common{
 				new \RecursiveDirectoryIterator($this->buildPath($path)),
 				\RecursiveIteratorIterator::CHILD_FIRST
 			);
-			foreach ($it as $file) {
+			/**
+			 * RecursiveDirectoryIterator on an NFS path isn't iterable with foreach
+			 * This bug is fixed in PHP 5.5.9 or before
+			 * See #8376
+			 */
+			$it->rewind();
+			while ($it->valid()) {
 				/**
 				 * @var \SplFileInfo $file
 				 */
+				$file = $it->current();
 				if (in_array($file->getBasename(), array('.', '..'))) {
+					$it->next();
 					continue;
 				} elseif ($file->isDir()) {
 					rmdir($file->getPathname());
 				} elseif ($file->isFile() || $file->isLink()) {
 					unlink($file->getPathname());
 				}
+				$it->next();
 			}
 			if ($result = @rmdir($this->buildPath($path))) {
 				$this->cleanMapper($path);
diff --git a/lib/private/files/storage/wrapper/quota.php b/lib/private/files/storage/wrapper/quota.php
index a878b2c5cf..c57c797f87 100644
--- a/lib/private/files/storage/wrapper/quota.php
+++ b/lib/private/files/storage/wrapper/quota.php
@@ -30,7 +30,7 @@ class Quota extends Wrapper {
 	}
 
 	/**
-	 * @return quota value
+	 * @return int quota value
 	 */
 	public function getQuota() {
 		return $this->quota;
diff --git a/lib/private/files/stream/oc.php b/lib/private/files/stream/oc.php
index 88e7e062df..c206b41f55 100644
--- a/lib/private/files/stream/oc.php
+++ b/lib/private/files/stream/oc.php
@@ -18,7 +18,15 @@ class OC {
 	static private $rootView;
 
 	private $path;
+
+	/**
+	 * @var resource
+	 */
 	private $dirSource;
+
+	/**
+	 * @var resource
+	 */
 	private $fileSource;
 	private $meta;
 
diff --git a/lib/private/files/type/templatemanager.php b/lib/private/files/type/templatemanager.php
index cd1536d273..e693e7079a 100644
--- a/lib/private/files/type/templatemanager.php
+++ b/lib/private/files/type/templatemanager.php
@@ -19,7 +19,7 @@ class TemplateManager {
 	 * get the path of the template for a mimetype
 	 *
 	 * @param string $mimetype
-	 * @return string | null
+	 * @return string|null
 	 */
 	public function getTemplatePath($mimetype) {
 		if (isset($this->templates[$mimetype])) {
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 31ec8cfacf..940f31fe42 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -11,7 +11,7 @@
  * working with files within that view (e.g. read, write, delete, etc.). Each
  * view is restricted to a set of directories via a virtual root. The default view
  * uses the currently logged in user's data directory as root (parts of
- * OC_Filesystem are merely a wrapper for OC_FilesystemView).
+ * OC_Filesystem are merely a wrapper for OC\Files\View).
  *
  * Apps that need to access files outside of the user data folders (to modify files
  * belonging to a user other than the one currently logged in, for example) should
@@ -37,7 +37,7 @@ class View {
 	}
 
 	public function getAbsolutePath($path = '/') {
-		if (!$path) {
+		if ($path === '') {
 			$path = '/';
 		}
 		if ($path[0] !== '/') {
@@ -109,7 +109,7 @@ class View {
 	 * resolve a path to a storage and internal path
 	 *
 	 * @param string $path
-	 * @return array consisting of the storage and the internal path
+	 * @return array an array consisting of the storage and the internal path
 	 */
 	public function resolvePath($path) {
 		$a = $this->getAbsolutePath($path);
@@ -168,6 +168,10 @@ class View {
 		}
 	}
 
+	/**
+	 * @param string $path
+	 * @return resource
+	 */
 	public function opendir($path) {
 		return $this->basicOperation('opendir', $path, array('read'));
 	}
@@ -271,6 +275,39 @@ class View {
 		return $this->basicOperation('file_get_contents', $path, array('read'));
 	}
 
+	protected function emit_file_hooks_pre($exists, $path, &$run) {
+		if (!$exists) {
+			\OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_create, array(
+				Filesystem::signal_param_path => $this->getHookPath($path),
+				Filesystem::signal_param_run => &$run,
+			));
+		} else {
+			\OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_update, array(
+				Filesystem::signal_param_path => $this->getHookPath($path),
+				Filesystem::signal_param_run => &$run,
+			));
+		}
+		\OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_write, array(
+			Filesystem::signal_param_path => $this->getHookPath($path),
+			Filesystem::signal_param_run => &$run,
+		));
+	}
+
+	protected function emit_file_hooks_post($exists, $path) {
+		if (!$exists) {
+			\OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_post_create, array(
+				Filesystem::signal_param_path => $this->getHookPath($path),
+			));
+		} else {
+			\OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_post_update, array(
+				Filesystem::signal_param_path => $this->getHookPath($path),
+			));
+		}
+		\OC_Hook::emit(Filesystem::CLASSNAME, Filesystem::signal_post_write, array(
+			Filesystem::signal_param_path => $this->getHookPath($path),
+		));
+	}
+
 	public function file_put_contents($path, $data) {
 		if (is_resource($data)) { //not having to deal with streams in file_put_contents makes life easier
 			$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
@@ -282,24 +319,7 @@ class View {
 				$exists = $this->file_exists($path);
 				$run = true;
 				if ($this->shouldEmitHooks($path)) {
-					if (!$exists) {
-						\OC_Hook::emit(
-							Filesystem::CLASSNAME,
-							Filesystem::signal_create,
-							array(
-								Filesystem::signal_param_path => $this->getHookPath($path),
-								Filesystem::signal_param_run => &$run
-							)
-						);
-					}
-					\OC_Hook::emit(
-						Filesystem::CLASSNAME,
-						Filesystem::signal_write,
-						array(
-							Filesystem::signal_param_path => $this->getHookPath($path),
-							Filesystem::signal_param_run => &$run
-						)
-					);
+					$this->emit_file_hooks_pre($exists, $path, $run);
 				}
 				if (!$run) {
 					return false;
@@ -313,18 +333,7 @@ class View {
 						Updater::writeHook(array(
 							'path' => $this->getHookPath($path)
 						));
-						if (!$exists) {
-							\OC_Hook::emit(
-								Filesystem::CLASSNAME,
-								Filesystem::signal_post_create,
-								array(Filesystem::signal_param_path => $this->getHookPath($path))
-							);
-						}
-						\OC_Hook::emit(
-							Filesystem::CLASSNAME,
-							Filesystem::signal_post_write,
-							array(Filesystem::signal_param_path => $this->getHookPath($path))
-						);
+						$this->emit_file_hooks_post($exists, $path);
 					}
 					\OC_FileProxy::runPostProxies('file_put_contents', $absolutePath, $count);
 					return $result;
@@ -335,7 +344,7 @@ class View {
 				return false;
 			}
 		} else {
-			$hooks = ($this->file_exists($path)) ? array('write') : array('create', 'write');
+			$hooks = ($this->file_exists($path)) ? array('update', 'write') : array('create', 'write');
 			return $this->basicOperation('file_put_contents', $path, $hooks, $data);
 		}
 	}
@@ -378,6 +387,7 @@ class View {
 		) {
 			$path1 = $this->getRelativePath($absolutePath1);
 			$path2 = $this->getRelativePath($absolutePath2);
+			$exists = $this->file_exists($path2);
 
 			if ($path1 == null or $path2 == null) {
 				return false;
@@ -385,13 +395,7 @@ class View {
 			$run = true;
 			if ($this->shouldEmitHooks() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2))) {
 				// if it was a rename from a part file to a regular file it was a write and not a rename operation
-				\OC_Hook::emit(
-					Filesystem::CLASSNAME, Filesystem::signal_write,
-					array(
-						Filesystem::signal_param_path => $this->getHookPath($path2),
-						Filesystem::signal_param_run => &$run
-					)
-				);
+				$this->emit_file_hooks_pre($exists, $path2, $run);
 			} elseif ($this->shouldEmitHooks()) {
 				\OC_Hook::emit(
 					Filesystem::CLASSNAME, Filesystem::signal_rename,
@@ -448,13 +452,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,
-						array(
-							Filesystem::signal_param_path => $this->getHookPath($path2),
-						)
-					);
+					$this->emit_file_hooks_post($exists, $path2);
 				} elseif ($this->shouldEmitHooks() && $result !== false) {
 					Updater::renameHook(array(
 						'oldpath' => $this->getHookPath($path1),
@@ -507,26 +505,7 @@ class View {
 						Filesystem::signal_param_run => &$run
 					)
 				);
-				if ($run and !$exists) {
-					\OC_Hook::emit(
-						Filesystem::CLASSNAME,
-						Filesystem::signal_create,
-						array(
-							Filesystem::signal_param_path => $this->getHookPath($path2),
-							Filesystem::signal_param_run => &$run
-						)
-					);
-				}
-				if ($run) {
-					\OC_Hook::emit(
-						Filesystem::CLASSNAME,
-						Filesystem::signal_write,
-						array(
-							Filesystem::signal_param_path => $this->getHookPath($path2),
-							Filesystem::signal_param_run => &$run
-						)
-					);
-				}
+				$this->emit_file_hooks_pre($exists, $path2, $run);
 			}
 			if ($run) {
 				$mp1 = $this->getMountPoint($path1 . $postFix1);
@@ -566,18 +545,7 @@ class View {
 							Filesystem::signal_param_newpath => $this->getHookPath($path2)
 						)
 					);
-					if (!$exists) {
-						\OC_Hook::emit(
-							Filesystem::CLASSNAME,
-							Filesystem::signal_post_create,
-							array(Filesystem::signal_param_path => $this->getHookPath($path2))
-						);
-					}
-					\OC_Hook::emit(
-						Filesystem::CLASSNAME,
-						Filesystem::signal_post_write,
-						array(Filesystem::signal_param_path => $this->getHookPath($path2))
-					);
+					$this->emit_file_hooks_post($exists, $path2);
 				}
 				return $result;
 			} else {
@@ -588,6 +556,11 @@ class View {
 		}
 	}
 
+	/**
+	 * @param string $path
+	 * @param string $mode
+	 * @return resource
+	 */
 	public function fopen($path, $mode) {
 		$hooks = array();
 		switch ($mode) {
@@ -700,7 +673,7 @@ class View {
 	}
 
 	/**
-	 * @brief abstraction layer for basic filesystem functions: wrapper for \OC\Files\Storage\Storage
+	 * abstraction layer for basic filesystem functions: wrapper for \OC\Files\Storage\Storage
 	 * @param string $operation
 	 * @param string $path
 	 * @param array $hooks (optional)
@@ -832,7 +805,7 @@ class View {
 	 * @param string $path
 	 * @param boolean $includeMountPoints whether to add mountpoint sizes,
 	 * defaults to true
-	 * @return \OC\Files\FileInfo | false
+	 * @return \OC\Files\FileInfo|false
 	 */
 	public function getFileInfo($path, $includeMountPoints = true) {
 		$data = array();
@@ -1027,7 +1000,7 @@ class View {
 	 * change file metadata
 	 *
 	 * @param string $path
-	 * @param array | \OCP\Files\FileInfo $data
+	 * @param array|\OCP\Files\FileInfo $data
 	 * @return int
 	 *
 	 * returns the fileid of the updated file
diff --git a/lib/private/geo.php b/lib/private/geo.php
index cd62511f0c..bd9253bc0d 100644
--- a/lib/private/geo.php
+++ b/lib/private/geo.php
@@ -7,9 +7,9 @@
  */
 class OC_Geo{
 	/**
-	 * @brief returns the closest timezone to coordinates
-	 * @param $latitude
-	 * @param $longitude
+	 * returns the closest timezone to coordinates
+	 * @param float $latitude
+	 * @param float $longitude
 	 * @return mixed Closest timezone
 	 */
 	public static function timezone($latitude, $longitude) {
diff --git a/lib/private/group.php b/lib/private/group.php
index d9f430f833..8dc3812920 100644
--- a/lib/private/group.php
+++ b/lib/private/group.php
@@ -57,8 +57,8 @@ class OC_Group {
 	}
 
 	/**
-	 * @brief set the group backend
-	 * @param  \OC_Group_Backend $backend  The backend to use for user managment
+	 * set the group backend
+	 * @param \OC_Group_Backend $backend  The backend to use for user managment
 	 * @return bool
 	 */
 	public static function useBackend($backend) {
@@ -74,7 +74,7 @@ class OC_Group {
 	}
 
 	/**
-	 * @brief Try to create a new group
+	 * Try to create a new group
 	 * @param string $gid The name of the group to create
 	 * @return bool
 	 *
@@ -93,7 +93,7 @@ class OC_Group {
 	}
 
 	/**
-	 * @brief delete a group
+	 * delete a group
 	 * @param string $gid gid of the group to delete
 	 * @return bool
 	 *
@@ -118,7 +118,7 @@ class OC_Group {
 	}
 
 	/**
-	 * @brief is user in group?
+	 * is user in group?
 	 * @param string $uid uid of the user
 	 * @param string $gid gid of the group
 	 * @return bool
@@ -135,7 +135,7 @@ class OC_Group {
 	}
 
 	/**
-	 * @brief Add a user to a group
+	 * Add a user to a group
 	 * @param string $uid Name of the user to add to group
 	 * @param string $gid Name of the group in which add the user
 	 * @return bool
@@ -156,7 +156,7 @@ class OC_Group {
 	}
 
 	/**
-	 * @brief Removes a user from a group
+	 * Removes a user from a group
 	 * @param string $uid Name of the user to remove from group
 	 * @param string $gid Name of the group from which remove the user
 	 * @return bool
@@ -177,9 +177,9 @@ class OC_Group {
 	}
 
 	/**
-	 * @brief Get all groups a user belongs to
+	 * Get all groups a user belongs to
 	 * @param string $uid Name of the user
-	 * @return array with group names
+	 * @return array an array of group names
 	 *
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
@@ -199,11 +199,11 @@ class OC_Group {
 	}
 
 	/**
-	 * @brief get a list of all groups
+	 * get a list of all groups
 	 * @param string $search
 	 * @param int|null $limit
 	 * @param int|null $offset
-	 * @returns array with group names
+	 * @return array an array of group names
 	 *
 	 * Returns a list with all groups
 	 */
@@ -227,12 +227,12 @@ class OC_Group {
 	}
 
 	/**
-	 * @brief get a list of all users in a group
+	 * get a list of all users in a group
 	 * @param string $gid
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
-	 * @returns array with user ids
+	 * @return array an array of user ids
 	 */
 	public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		$group = self::getManager()->get($gid);
@@ -249,12 +249,12 @@ class OC_Group {
 	}
 
 	/**
-	 * @brief get a list of all users in several groups
+	 * get a list of all users in several groups
 	 * @param string[] $gids
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
-	 * @return array with user ids
+	 * @return array an array of user ids
 	 */
 	public static function usersInGroups($gids, $search = '', $limit = -1, $offset = 0) {
 		$users = array();
@@ -266,34 +266,24 @@ class OC_Group {
 	}
 
 	/**
-	 * @brief get a list of all display names in a group
+	 * get a list of all display names in a group
 	 * @param string $gid
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
-	 * @returns array with display names (value) and user ids(key)
+	 * @return array an array of display names (value) and user ids(key)
 	 */
 	public static function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		$group = self::getManager()->get($gid);
-		if ($group) {
-			$users = $group->searchDisplayName($search, $limit, $offset);
-			$displayNames = array();
-			foreach ($users as $user) {
-				$displayNames[$user->getUID()] = $user->getDisplayName();
-			}
-			return $displayNames;
-		} else {
-			return array();
-		}
+		return self::getManager()->displayNamesInGroup($gid, $search, $limit, $offset);
 	}
 
 	/**
-	 * @brief get a list of all display names in several groups
+	 * get a list of all display names in several groups
 	 * @param array $gids
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
-	 * @return array with display names (Key) user ids (value)
+	 * @return array an array of display names (Key) user ids (value)
 	 */
 	public static function displayNamesInGroups($gids, $search = '', $limit = -1, $offset = 0) {
 		$displayNames = array();
diff --git a/lib/private/group/backend.php b/lib/private/group/backend.php
index b0ed0d90d7..ab694268bb 100644
--- a/lib/private/group/backend.php
+++ b/lib/private/group/backend.php
@@ -33,7 +33,7 @@ define('OC_GROUP_BACKEND_CREATE_GROUP',      0x00000001);
 define('OC_GROUP_BACKEND_DELETE_GROUP',      0x00000010);
 define('OC_GROUP_BACKEND_ADD_TO_GROUP',      0x00000100);
 define('OC_GROUP_BACKEND_REMOVE_FROM_GOUP',  0x00001000);
-define('OC_GROUP_BACKEND_GET_DISPLAYNAME',   0x00010000);
+define('OC_GROUP_BACKEND_GET_DISPLAYNAME',   0x00010000); //OBSOLETE
 define('OC_GROUP_BACKEND_COUNT_USERS',       0x00100000);
 
 /**
@@ -45,12 +45,11 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 		OC_GROUP_BACKEND_DELETE_GROUP => 'deleteGroup',
 		OC_GROUP_BACKEND_ADD_TO_GROUP => 'addToGroup',
 		OC_GROUP_BACKEND_REMOVE_FROM_GOUP => 'removeFromGroup',
-		OC_GROUP_BACKEND_GET_DISPLAYNAME => 'displayNamesInGroup',
 		OC_GROUP_BACKEND_COUNT_USERS => 'countUsersInGroup',
 	);
 
 	/**
-	* @brief Get all supported actions
+	* Get all supported actions
 	* @return int bitwise-or'ed actions
 	*
 	* Returns the supported actions as int to be
@@ -68,9 +67,9 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	}
 
 	/**
-	* @brief Check if backend implements actions
+	* Check if backend implements actions
 	* @param int $actions bitwise-or'ed actions
-	* @return boolean
+	* @return bool
 	*
 	* Returns the supported actions as int to be
 	* compared with OC_GROUP_BACKEND_CREATE_GROUP etc.
@@ -80,7 +79,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	}
 
 	/**
-	 * @brief is user in group?
+	 * is user in group?
 	 * @param string $uid uid of the user
 	 * @param string $gid gid of the group
 	 * @return bool
@@ -92,9 +91,9 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	}
 
 	/**
-	 * @brief Get all groups a user belongs to
+	 * Get all groups a user belongs to
 	 * @param string $uid Name of the user
-	 * @return array with group names
+	 * @return array an array of group names
 	 *
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
@@ -104,11 +103,11 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	}
 
 	/**
-	 * @brief get a list of all groups
+	 * get a list of all groups
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
-	 * @return array with group names
+	 * @return array an array of group names
 	 *
 	 * Returns a list with all groups
 	 */
@@ -127,33 +126,14 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	}
 
 	/**
-	 * @brief get a list of all users in a group
+	 * get a list of all users in a group
 	 * @param string $gid
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
-	 * @return array with user ids
+	 * @return array an array of user ids
 	 */
 	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		return array();
 	}
-
-	/**
-	 * @brief get a list of all display names in a group
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array with display names (value) and user ids (key)
-	 */
-	public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		$displayNames = array();
-		$users = $this->usersInGroup($gid, $search, $limit, $offset);
-		foreach ($users as $user) {
-			$displayNames[$user] = $user;
-		}
-
-		return $displayNames;
-	}
-
 }
diff --git a/lib/private/group/database.php b/lib/private/group/database.php
index 3815dcff2e..baaf2cf273 100644
--- a/lib/private/group/database.php
+++ b/lib/private/group/database.php
@@ -43,7 +43,7 @@
 class OC_Group_Database extends OC_Group_Backend {
 
 	/**
-	 * @brief Try to create a new group
+	 * Try to create a new group
 	 * @param string $gid The name of the group to create
 	 * @return bool
 	 *
@@ -69,7 +69,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	}
 
 	/**
-	 * @brief delete a group
+	 * delete a group
 	 * @param string $gid gid of the group to delete
 	 * @return bool
 	 *
@@ -88,7 +88,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	}
 
 	/**
-	 * @brief is user in group?
+	 * is user in group?
 	 * @param string $uid uid of the user
 	 * @param string $gid gid of the group
 	 * @return bool
@@ -104,7 +104,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	}
 
 	/**
-	 * @brief Add a user to a group
+	 * Add a user to a group
 	 * @param string $uid Name of the user to add to group
 	 * @param string $gid Name of the group in which add the user
 	 * @return bool
@@ -123,7 +123,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	}
 
 	/**
-	 * @brief Removes a user from a group
+	 * Removes a user from a group
 	 * @param string $uid Name of the user to remove from group
 	 * @param string $gid Name of the group from which remove the user
 	 * @return bool
@@ -138,9 +138,9 @@ class OC_Group_Database extends OC_Group_Backend {
 	}
 
 	/**
-	 * @brief Get all groups a user belongs to
+	 * Get all groups a user belongs to
 	 * @param string $uid Name of the user
-	 * @return array with group names
+	 * @return array an array of group names
 	 *
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
@@ -159,11 +159,11 @@ class OC_Group_Database extends OC_Group_Backend {
 	}
 
 	/**
-	 * @brief get a list of all groups
+	 * get a list of all groups
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
-	 * @return array with group names
+	 * @return array an array of group names
 	 *
 	 * Returns a list with all groups
 	 */
@@ -192,12 +192,12 @@ class OC_Group_Database extends OC_Group_Backend {
 	}
 
 	/**
-	 * @brief get a list of all users in a group
+	 * get a list of all users in a group
 	 * @param string $gid
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
-	 * @return array with user ids
+	 * @return array an array of user ids
 	 */
 	public function usersInGroup($gid, $search = '', $limit = null, $offset = null) {
 		$stmt = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` LIKE ?',
@@ -212,12 +212,11 @@ class OC_Group_Database extends OC_Group_Backend {
 	}
 
 	/**
-	 * @brief get the number of all users matching the search string in a group
+	 * get the number of all users matching the search string in a group
 	 * @param string $gid
 	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return int | false
+	 * @return int|false
+	 * @throws DatabaseException
 	 */
 	public function countUsersInGroup($gid, $search = '') {
 		$stmt = OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` LIKE ?');
@@ -225,29 +224,4 @@ class OC_Group_Database extends OC_Group_Backend {
 		return $result->fetchOne();
 	}
 
-	/**
-	 * @brief get a list of all display names in a group
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array with display names (value) and user ids (key)
-	 */
-	public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		$displayNames = array();
-
-		$stmt = OC_DB::prepare('SELECT `*PREFIX*users`.`uid`, `*PREFIX*users`.`displayname`'
-			.' FROM `*PREFIX*users`'
-			.' INNER JOIN `*PREFIX*group_user` ON `*PREFIX*group_user`.`uid` = `*PREFIX*users`.`uid`'
-			.' WHERE `gid` = ? AND `*PREFIX*group_user`.`uid` LIKE ?',
-			$limit,
-			$offset);
-		$result = $stmt->execute(array($gid, $search.'%'));
-		$users = array();
-		while ($row = $result->fetchRow()) {
-			$displayName = trim($row['displayname'], ' ');
-			$displayNames[$row['uid']] = empty($displayName) ? $row['uid'] : $displayName;
-		}
-		return $displayNames;
-	}
 }
diff --git a/lib/private/group/dummy.php b/lib/private/group/dummy.php
index 94cbb607ad..e48c6a0e26 100644
--- a/lib/private/group/dummy.php
+++ b/lib/private/group/dummy.php
@@ -27,11 +27,11 @@
 class OC_Group_Dummy extends OC_Group_Backend {
 	private $groups=array();
 	/**
-	 * @brief Try to create a new group
+	 * Try to create a new group
 	 * @param string $gid The name of the group to create
-	 * @returns true/false
+	 * @return bool
 	 *
-	 * Trys to create a new group. If the group name already exists, false will
+	 * Tries to create a new group. If the group name already exists, false will
 	 * be returned.
 	 */
 	public function createGroup($gid) {
@@ -44,9 +44,9 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	}
 
 	/**
-	 * @brief delete a group
-	 * @param $gid gid of the group to delete
-	 * @returns true/false
+	 * delete a group
+	 * @param string $gid gid of the group to delete
+	 * @return bool
 	 *
 	 * Deletes a group and removes it from the group_user-table
 	 */
@@ -60,10 +60,10 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	}
 
 	/**
-	 * @brief is user in group?
-	 * @param $uid uid of the user
-	 * @param $gid gid of the group
-	 * @returns true/false
+	 * is user in group?
+	 * @param string $uid uid of the user
+	 * @param string $gid gid of the group
+	 * @return bool
 	 *
 	 * Checks whether the user is member of a group or not.
 	 */
@@ -76,10 +76,10 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	}
 
 	/**
-	 * @brief Add a user to a group
-	 * @param $uid Name of the user to add to group
-	 * @param $gid Name of the group in which add the user
-	 * @returns true/false
+	 * Add a user to a group
+	 * @param string $uid Name of the user to add to group
+	 * @param string $gid Name of the group in which add the user
+	 * @return bool
 	 *
 	 * Adds a user to a group.
 	 */
@@ -97,10 +97,10 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	}
 
 	/**
-	 * @brief Removes a user from a group
-	 * @param $uid NameUSER of the user to remove from group
-	 * @param $gid Name of the group from which remove the user
-	 * @returns true/false
+	 * Removes a user from a group
+	 * @param string $uid Name of the user to remove from group
+	 * @param string $gid Name of the group from which remove the user
+	 * @return bool
 	 *
 	 * removes the user from a group.
 	 */
@@ -117,9 +117,9 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	}
 
 	/**
-	 * @brief Get all groups a user belongs to
-	 * @param $uid Name of the user
-	 * @returns array with group names
+	 * Get all groups a user belongs to
+	 * @param string $uid Name of the user
+	 * @return array an array of group names
 	 *
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
@@ -136,18 +136,23 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	}
 
 	/**
-	 * @brief get a list of all groups
-	 * @returns array with group names
-	 *
-	 * Returns a list with all groups
+	 * Get a list of all groups
+	 * @param string $search
+	 * @param int $limit
+	 * @param int $offset
+	 * @return array an array of group names
 	 */
 	public function getGroups($search = '', $limit = -1, $offset = 0) {
 		return array_keys($this->groups);
 	}
 
 	/**
-	 * @brief get a list of all users in a group
-	 * @returns array with user ids
+	 * Get a list of all users in a group
+	 * @param string $gid
+	 * @param string $search
+	 * @param int $limit
+	 * @param int $offset
+	 * @return array an array of user IDs
 	 */
 	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		if(isset($this->groups[$gid])) {
@@ -158,8 +163,12 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	}
 
 	/**
-	 * @brief get the number of all users in a group
-	 * @returns int | bool
+	 * get the number of all users in a group
+	 * @param string $gid
+	 * @param string $search
+	 * @param int $limit
+	 * @param int $offset
+	 * @return int
 	 */
 	public function countUsersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		if(isset($this->groups[$gid])) {
diff --git a/lib/private/group/example.php b/lib/private/group/example.php
index 3519b9ed92..8c1e22866f 100644
--- a/lib/private/group/example.php
+++ b/lib/private/group/example.php
@@ -27,58 +27,58 @@
  */
 abstract class OC_Group_Example {
 	/**
-	 * @brief Try to create a new group
-	 * @param $gid The name of the group to create
-	 * @returns true/false
+	 * Try to create a new group
+	 * @param string $gid The name of the group to create
+	 * @return bool
 	 *
-	 * Trys to create a new group. If the group name already exists, false will
+	 * Tries to create a new group. If the group name already exists, false will
 	 * be returned.
 	 */
 	abstract public static function createGroup($gid);
 
 	/**
-	 * @brief delete a group
-	 * @param $gid gid of the group to delete
-	 * @returns true/false
+	 * delete a group
+	 * @param string $gid gid of the group to delete
+	 * @return bool
 	 *
 	 * Deletes a group and removes it from the group_user-table
 	 */
 	abstract public static function deleteGroup($gid);
 
 	/**
-	 * @brief is user in group?
-	 * @param $uid uid of the user
-	 * @param $gid gid of the group
-	 * @returns true/false
+	 * is user in group?
+	 * @param string $uid uid of the user
+	 * @param string $gid gid of the group
+	 * @return bool
 	 *
 	 * Checks whether the user is member of a group or not.
 	 */
 	abstract public static function inGroup($uid, $gid);
 
 	/**
-	 * @brief Add a user to a group
-	 * @param $uid Name of the user to add to group
-	 * @param $gid Name of the group in which add the user
-	 * @returns true/false
+	 * Add a user to a group
+	 * @param string $uid Name of the user to add to group
+	 * @param string $gid Name of the group in which add the user
+	 * @return bool
 	 *
 	 * Adds a user to a group.
 	 */
 	abstract public static function addToGroup($uid, $gid);
 
 	/**
-	 * @brief Removes a user from a group
-	 * @param $uid NameUSER of the user to remove from group
-	 * @param $gid Name of the group from which remove the user
-	 * @returns true/false
+	 * Removes a user from a group
+	 * @param string $uid Name of the user to remove from group
+	 * @param string $gid Name of the group from which remove the user
+	 * @return bool
 	 *
 	 * removes the user from a group.
 	 */
 	abstract public static function removeFromGroup($uid, $gid);
 
 	/**
-	 * @brief Get all groups a user belongs to
-	 * @param $uid Name of the user
-	 * @returns array with group names
+	 * Get all groups a user belongs to
+	 * @param string $uid Name of the user
+	 * @return array an array of group names
 	 *
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
@@ -86,24 +86,28 @@ abstract class OC_Group_Example {
 	abstract public static function getUserGroups($uid);
 
 	/**
-	 * @brief get a list of all groups
-	 * @returns array with group names
-	 *
-	 * Returns a list with all groups
+	 * get a list of all groups
+	 * @param string $search
+	 * @param int $limit
+	 * @param int $offset
+	 * @return array an array of group names
 	 */
 	abstract public static function getGroups($search = '', $limit = -1, $offset = 0);
 
 	/**
-	 * check if a group exists
+	 * Check if a group exists
 	 * @param string $gid
 	 * @return bool
 	 */
 	abstract public function groupExists($gid);
 
 	/**
-	 * @brief get a list of all users in a group
-	 * @returns array with user ids
+	 * get a list of all users in a group
+	 * @param string $gid
+	 * @param string $search
+	 * @param int $limit
+	 * @param int $offset
+	 * @return array an array of user ids
 	 */
 	abstract public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0);
-
 }
diff --git a/lib/private/group/group.php b/lib/private/group/group.php
index 3efbb6e702..3e245ab6bb 100644
--- a/lib/private/group/group.php
+++ b/lib/private/group/group.php
@@ -26,7 +26,7 @@ class Group {
 	private $usersLoaded;
 
 	/**
-	 * @var \OC_Group_Backend[] | \OC_Group_Database[] $backend
+	 * @var \OC_Group_Backend[]|\OC_Group_Database[] $backend
 	 */
 	private $backends;
 
@@ -184,7 +184,7 @@ class Group {
 	 * returns the number of users matching the search string
 	 *
 	 * @param string $search
-	 * @return int | bool
+	 * @return int|bool
 	 */
 	public function count($search) {
 		$users = false;
@@ -212,11 +212,7 @@ class Group {
 	public function searchDisplayName($search, $limit = null, $offset = null) {
 		$users = array();
 		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(OC_GROUP_BACKEND_GET_DISPLAYNAME)) {
-				$userIds = array_keys($backend->displayNamesInGroup($this->gid, $search, $limit, $offset));
-			} else {
-				$userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);
-			}
+			$userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);
 			$users = $this->getVerifiedUsers($userIds);
 			if (!is_null($limit) and $limit <= 0) {
 				return array_values($users);
@@ -248,7 +244,7 @@ class Group {
 	}
 
 	/**
-	 * @brief returns all the Users from an array that really exists
+	 * returns all the Users from an array that really exists
 	 * @param string[] $userIds an array containing user IDs
 	 * @return \OC\User\User[] an Array with the userId as Key and \OC\User\User as value
 	 */
diff --git a/lib/private/group/interface.php b/lib/private/group/interface.php
index 4ef3663837..ee5c2d635d 100644
--- a/lib/private/group/interface.php
+++ b/lib/private/group/interface.php
@@ -23,7 +23,7 @@
 
 interface OC_Group_Interface {
 	/**
-	* @brief Check if backend implements actions
+	* Check if backend implements actions
 	* @param int $actions bitwise-or'ed actions
 	* @return boolean
 	*
@@ -33,7 +33,7 @@ interface OC_Group_Interface {
 	public function implementsActions($actions);
 
 	/**
-	 * @brief is user in group?
+	 * is user in group?
 	 * @param string $uid uid of the user
 	 * @param string $gid gid of the group
 	 * @return bool
@@ -43,9 +43,9 @@ interface OC_Group_Interface {
 	public function inGroup($uid, $gid);
 
 	/**
-	 * @brief Get all groups a user belongs to
+	 * Get all groups a user belongs to
 	 * @param string $uid Name of the user
-	 * @return array with group names
+	 * @return array an array of group names
 	 *
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
@@ -53,11 +53,11 @@ interface OC_Group_Interface {
 	public function getUserGroups($uid);
 
 	/**
-	 * @brief get a list of all groups
+	 * get a list of all groups
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
-	 * @return array with group names
+	 * @return array an array of group names
 	 *
 	 * Returns a list with all groups
 	 */
@@ -71,12 +71,12 @@ interface OC_Group_Interface {
 	public function groupExists($gid);
 
 	/**
-	 * @brief get a list of all users in a group
+	 * get a list of all users in a group
 	 * @param string $gid
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
-	 * @return array with user ids
+	 * @return array an array of user ids
 	 */
 	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0);
 
diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index f591bd32ab..dae6443e9d 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -28,7 +28,7 @@ use OC\Hooks\PublicEmitter;
  */
 class Manager extends PublicEmitter {
 	/**
-	 * @var \OC_Group_Backend[] | \OC_Group_Database[] $backends
+	 * @var \OC_Group_Backend[]|\OC_Group_Database[] $backends
 	 */
 	private $backends = array();
 
@@ -40,19 +40,38 @@ class Manager extends PublicEmitter {
 	/**
 	 * @var \OC\Group\Group[]
 	 */
-	private $cachedGroups;
+	private $cachedGroups = array();
+
+	/**
+	 * @var \OC\Group\Group[]
+	 */
+	private $cachedUserGroups = array();
 
 	/**
 	 * @param \OC\User\Manager $userManager
 	 */
 	public function __construct($userManager) {
 		$this->userManager = $userManager;
-		$cache = & $this->cachedGroups;
-		$this->listen('\OC\Group', 'postDelete', function ($group) use (&$cache) {
+		$cachedGroups = & $this->cachedGroups;
+		$cachedUserGroups = & $this->cachedUserGroups;
+		$this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups) {
 			/**
 			 * @var \OC\Group\Group $group
 			 */
-			unset($cache[$group->getGID()]);
+			unset($cachedGroups[$group->getGID()]);
+			$cachedUserGroups = array();
+		});
+		$this->listen('\OC\Group', 'postAddUser', function ($group) use (&$cachedUserGroups) {
+			/**
+			 * @var \OC\Group\Group $group
+			 */
+			$cachedUserGroups = array();
+		});
+		$this->listen('\OC\Group', 'postRemoveUser', function ($group) use (&$cachedUserGroups) {
+			/**
+			 * @var \OC\Group\Group $group
+			 */
+			$cachedUserGroups = array();
 		});
 	}
 
@@ -135,7 +154,7 @@ class Manager extends PublicEmitter {
 		foreach ($this->backends as $backend) {
 			$groupIds = $backend->getGroups($search, $limit, $offset);
 			foreach ($groupIds as $groupId) {
-				$groups[$groupId] = $this->getGroupObject($groupId);
+				$groups[$groupId] = $this->get($groupId);
 			}
 			if (!is_null($limit) and $limit <= 0) {
 				return array_values($groups);
@@ -149,13 +168,52 @@ class Manager extends PublicEmitter {
 	 * @return \OC\Group\Group[]
 	 */
 	public function getUserGroups($user) {
+		$uid = $user->getUID();
+		if (isset($this->cachedUserGroups[$uid])) {
+			return $this->cachedUserGroups[$uid];
+		}
 		$groups = array();
 		foreach ($this->backends as $backend) {
-			$groupIds = $backend->getUserGroups($user->getUID());
+			$groupIds = $backend->getUserGroups($uid);
 			foreach ($groupIds as $groupId) {
-				$groups[$groupId] = $this->getGroupObject($groupId);
+				$groups[$groupId] = $this->get($groupId);
 			}
 		}
-		return array_values($groups);
+		$this->cachedUserGroups[$uid] = array_values($groups);
+		return $this->cachedUserGroups[$uid];
+	}
+
+	/**
+	 * get a list of all display names in a group
+	 * @param string $gid
+	 * @param string $search
+	 * @param int $limit
+	 * @param int $offset
+	 * @return array an array of display names (value) and user ids (key)
+	 */
+	public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
+		$group = $this->get($gid);
+		if(is_null($group)) {
+			return array();
+		}
+		// only user backends have the capability to do a complex search for users
+		$groupUsers  = $group->searchUsers('', $limit, $offset);
+		$search = trim($search);
+		if(!empty($search)) {
+			//TODO: for OC 7 earliest: user backend should get a method to check selected users against a pattern
+			$filteredUsers = $this->userManager->search($search);
+			$testUsers = true;
+		} else {
+			$filteredUsers = array();
+			$testUsers = false;
+		}
+
+		$matchingUsers = array();
+		foreach($groupUsers as $user) {
+			if(!$testUsers || isset($filteredUsers[$user->getUID()])) {
+				$matchingUsers[$user->getUID()] = $user->getDisplayName();
+			}
+		}
+		return $matchingUsers;
 	}
 }
diff --git a/lib/private/helper.php b/lib/private/helper.php
index ab1e0d3892..4ad792dfb1 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -31,12 +31,12 @@ class OC_Helper {
 	private static $templateManager;
 
 	/**
-	 * @brief Creates an url using a defined route
-	 * @param $route
+	 * Creates an url using a defined route
+	 * @param string $route
 	 * @param array $parameters
 	 * @return
 	 * @internal param array $args with param=>value, will be appended to the returned url
-	 * @returns string the url
+	 * @return string the url
 	 *
 	 * Returns a url to the given app and file.
 	 */
@@ -45,7 +45,7 @@ class OC_Helper {
 	}
 
 	/**
-	 * @brief Creates an url
+	 * Creates an url
 	 * @param string $app app
 	 * @param string $file file
 	 * @param array $args array with param=>value, will be appended to the returned url
@@ -68,7 +68,7 @@ class OC_Helper {
 	}
 
 	/**
-	 * @brief Creates an absolute url
+	 * Creates an absolute url
 	 * @param string $app app
 	 * @param string $file file
 	 * @param array $args array with param=>value, will be appended to the returned url
@@ -78,11 +78,13 @@ class OC_Helper {
 	 * Returns a absolute url to the given app and file.
 	 */
 	public static function linkToAbsolute($app, $file, $args = array()) {
-		return self::linkTo($app, $file, $args);
+		return OC::$server->getURLGenerator()->getAbsoluteURL(
+			self::linkTo($app, $file, $args)
+		);
 	}
 
 	/**
-	 * @brief Makes an $url absolute
+	 * Makes an $url absolute
 	 * @param string $url the url
 	 * @return string the absolute url
 	 *
@@ -93,7 +95,7 @@ class OC_Helper {
 	}
 
 	/**
-	 * @brief Creates an url for remote use
+	 * Creates an url for remote use
 	 * @param string $service id
 	 * @return string the url
 	 *
@@ -104,7 +106,7 @@ class OC_Helper {
 	}
 
 	/**
-	 * @brief Creates an absolute url for remote use
+	 * Creates an absolute url for remote use
 	 * @param string $service id
 	 * @param bool $add_slash
 	 * @return string the url
@@ -112,12 +114,14 @@ class OC_Helper {
 	 * Returns a absolute url to the given service.
 	 */
 	public static function linkToRemote($service, $add_slash = true) {
-		return self::makeURLAbsolute(self::linkToRemoteBase($service))
-		. (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : '');
+		return OC::$server->getURLGenerator()->getAbsoluteURL(
+			self::linkToRemoteBase($service)
+				. (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : '')
+		);
 	}
 
 	/**
-	 * @brief Creates an absolute url for public use
+	 * Creates an absolute url for public use
 	 * @param string $service id
 	 * @param bool $add_slash
 	 * @return string the url
@@ -125,12 +129,16 @@ class OC_Helper {
 	 * Returns a absolute url to the given service.
 	 */
 	public static function linkToPublic($service, $add_slash = false) {
-		return self::linkToAbsolute('', 'public.php') . '?service=' . $service
-		. (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : '');
+		return OC::$server->getURLGenerator()->getAbsoluteURL(
+			self::linkTo(
+				'', 'public.php') . '?service=' . $service
+				. (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : ''
+			)
+		);
 	}
 
 	/**
-	 * @brief Creates path to an image
+	 * Creates path to an image
 	 * @param string $app app
 	 * @param string $image image name
 	 * @return string the url
@@ -142,7 +150,7 @@ class OC_Helper {
 	}
 
 	/**
-	 * @brief get path to icon of file type
+	 * get path to icon of file type
 	 * @param string $mimetype mimetype
 	 * @return string the url
 	 *
@@ -256,7 +264,7 @@ class OC_Helper {
 	}
 
 	/**
-	 * @brief get path to preview of file
+	 * get path to preview of file
 	 * @param string $path path
 	 * @return string the url
 	 *
@@ -271,7 +279,7 @@ class OC_Helper {
 	}
 
 	/**
-	 * @brief Make a human file size
+	 * Make a human file size
 	 * @param int $bytes file size in bytes
 	 * @return string a human readable file size
 	 *
@@ -306,7 +314,33 @@ class OC_Helper {
 	}
 
 	/**
-	 * @brief Make a computer file size
+	 * Make a php file size
+	 * @param int $bytes file size in bytes
+	 * @return string a php parseable file size
+	 *
+	 * Makes 2048 to 2k and 2^41 to 2048G
+	 */
+	public static function phpFileSize($bytes) {
+		if ($bytes < 0) {
+			return "?";
+		}
+		if ($bytes < 1024) {
+			return $bytes . "B";
+		}
+		$bytes = round($bytes / 1024, 1);
+		if ($bytes < 1024) {
+			return $bytes . "K";
+		}
+		$bytes = round($bytes / 1024, 1);
+		if ($bytes < 1024) {
+			return $bytes . "M";
+		}
+		$bytes = round($bytes / 1024, 1);
+		return $bytes . "G";
+	}
+
+	/**
+	 * Make a computer file size
 	 * @param string $str file size in human readable format
 	 * @return int a file size in bytes
 	 *
@@ -343,7 +377,7 @@ class OC_Helper {
 	}
 
 	/**
-	 * @brief Recursive copying of folders
+	 * Recursive copying of folders
 	 * @param string $src source folder
 	 * @param string $dest target folder
 	 *
@@ -365,7 +399,7 @@ class OC_Helper {
 	}
 
 	/**
-	 * @brief Recursive deletion of folders
+	 * Recursive deletion of folders
 	 * @param string $dir path to the folder
 	 * @return bool
 	 */
@@ -451,7 +485,7 @@ class OC_Helper {
 	}
 
 	/**
-	 * @brief Checks $_REQUEST contains a var for the $s key. If so, returns the html-escaped value of this var; otherwise returns the default value provided by $d.
+	 * Checks $_REQUEST contains a var for the $s key. If so, returns the html-escaped value of this var; otherwise returns the default value provided by $d.
 	 * @param string $s name of the var to escape, if set.
 	 * @param string $d default value.
 	 * @return string the print-safe value.
@@ -461,7 +495,7 @@ class OC_Helper {
 	/**
 	 * detect if a given program is found in the search PATH
 	 *
-	 * @param $name
+	 * @param string $name
 	 * @param bool $path
 	 * @internal param string $program name
 	 * @internal param string $optional search path, defaults to $PATH
@@ -636,8 +670,8 @@ class OC_Helper {
 	/**
 	 * Adds a suffix to the name in case the file exists
 	 *
-	 * @param $path
-	 * @param $filename
+	 * @param string $path
+	 * @param string $filename
 	 * @return string
 	 */
 	public static function buildNotExistingFileName($path, $filename) {
@@ -648,8 +682,8 @@ class OC_Helper {
 	/**
 	 * Adds a suffix to the name in case the file exists
 	 *
-	 * @param $path
-	 * @param $filename
+	 * @param string $path
+	 * @param string $filename
 	 * @return string
 	 */
 	public static function buildNotExistingFileNameForView($path, $filename, \OC\Files\View $view) {
@@ -692,21 +726,33 @@ class OC_Helper {
 	}
 
 	/**
-	 * @brief Checks if $sub is a subdirectory of $parent
+	 * Checks if $sub is a subdirectory of $parent
 	 *
 	 * @param string $sub
 	 * @param string $parent
 	 * @return bool
 	 */
-	public static function issubdirectory($sub, $parent) {
-		if (strpos(realpath($sub), realpath($parent)) === 0) {
+	public static function isSubDirectory($sub, $parent) {
+		$realpathSub = realpath($sub);
+		$realpathParent = realpath($parent);
+
+		// realpath() may return false in case the directory does not exist
+		// since we can not be sure how different PHP versions may behave here
+		// we do an additional check whether realpath returned false
+		if($realpathSub === false ||  $realpathParent === false) {
+			return false;
+		}
+
+		// Check whether $sub is a subdirectory of $parent
+		if (strpos($realpathSub, $realpathParent) === 0) {
 			return true;
 		}
+
 		return false;
 	}
 
 	/**
-	 * @brief Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
+	 * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
 	 *
 	 * @param array $input The array to work on
 	 * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
@@ -727,9 +773,9 @@ class OC_Helper {
 	}
 
 	/**
-	 * @brief replaces a copy of string delimited by the start and (optionally) length parameters with the string given in replacement.
+	 * replaces a copy of string delimited by the start and (optionally) length parameters with the string given in replacement.
 	 *
-	 * @param $string
+	 * @param string $string
 	 * @param string $replacement The replacement string.
 	 * @param int $start If start is positive, the replacing will begin at the start'th offset into string. If start is negative, the replacing will begin at the start'th character from the end of string.
 	 * @param int $length Length of the part to be replaced
@@ -748,7 +794,7 @@ class OC_Helper {
 	}
 
 	/**
-	 * @brief Replace all occurrences of the search string with the replacement string
+	 * Replace all occurrences of the search string with the replacement string
 	 *
 	 * @param string $search The value being searched for, otherwise known as the needle.
 	 * @param string $replace The replacement
@@ -770,7 +816,7 @@ class OC_Helper {
 	}
 
 	/**
-	 * @brief performs a search in a nested array
+	 * performs a search in a nested array
 	 * @param array $haystack the array to be searched
 	 * @param string $needle the search string
 	 * @param string $index optional, only search this key name
@@ -812,7 +858,7 @@ class OC_Helper {
 	}
 
 	/**
-	 * @brief calculates the maximum upload size respecting system settings, free space and user quota
+	 * calculates the maximum upload size respecting system settings, free space and user quota
 	 *
 	 * @param string $dir the current folder where the user currently operates
 	 * @param int $freeSpace the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly
@@ -827,7 +873,7 @@ class OC_Helper {
 
 	/**
 	 * Calculate free space left within user quota
-	 * 
+	 *
 	 * @param string $dir the current folder where the user currently operates
 	 * @return int number of bytes representing
 	 */
diff --git a/lib/private/hook.php b/lib/private/hook.php
index b63b442c31..30e22847c7 100644
--- a/lib/private/hook.php
+++ b/lib/private/hook.php
@@ -8,7 +8,7 @@ class OC_Hook{
 	static private $registered = array();
 
 	/**
-	 * @brief connects a function to a hook
+	 * connects a function to a hook
 	 * @param string $signalclass class name of emitter
 	 * @param string $signalname name of signal
 	 * @param string $slotclass class name of slot
@@ -42,10 +42,10 @@ class OC_Hook{
 	}
 
 	/**
-	 * @brief emits a signal
+	 * emits a signal
 	 * @param string $signalclass class name of emitter
 	 * @param string $signalname name of signal
-	 * @param array $params defautl: array() array with additional data
+	 * @param mixed $params default: array() array with additional data
 	 * @return bool, true if slots exists or false if not
 	 *
 	 * Emits a signal. To get data from the slot use references!
diff --git a/lib/private/image.php b/lib/private/image.php
index 14aa64d12d..5331c39915 100644
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@ -33,7 +33,7 @@ class OC_Image {
 	private $fileInfo;
 
 	/**
-	* @brief Get mime type for an image file.
+	* Get mime type for an 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.
 	*/
@@ -48,7 +48,7 @@ class OC_Image {
 	}
 
 	/**
-	 * @brief Constructor.
+	 * Constructor.
 	 * @param resource|string $imageRef The path to a local file, a base64 encoded string or a resource created by
 	 * an imagecreate* function.
 	 * @return \OC_Image False on error
@@ -70,7 +70,7 @@ class OC_Image {
 	}
 
 	/**
-	* @brief Determine whether the object contains an image resource.
+	* Determine whether the object contains an image resource.
 	* @return bool
 	*/
 	public function valid() { // apparently you can't name a method 'empty'...
@@ -78,7 +78,7 @@ class OC_Image {
 	}
 
 	/**
-	* @brief Returns the MIME type of the image or an empty string if no image is loaded.
+	* Returns the MIME type of the image or an empty string if no image is loaded.
 	* @return string
 	*/
 	public function mimeType() {
@@ -86,7 +86,7 @@ class OC_Image {
 	}
 
 	/**
-	* @brief Returns the width of the image or -1 if no image is loaded.
+	* Returns the width of the image or -1 if no image is loaded.
 	* @return int
 	*/
 	public function width() {
@@ -94,7 +94,7 @@ class OC_Image {
 	}
 
 	/**
-	* @brief Returns the height of the image or -1 if no image is loaded.
+	* Returns the height of the image or -1 if no image is loaded.
 	* @return int
 	*/
 	public function height() {
@@ -102,7 +102,7 @@ class OC_Image {
 	}
 
 	/**
-	* @brief Returns the width when the image orientation is top-left.
+	* Returns the width when the image orientation is top-left.
 	* @return int
 	*/
 	public function widthTopLeft() {
@@ -125,7 +125,7 @@ class OC_Image {
 	}
 
 	/**
-	* @brief Returns the height when the image orientation is top-left.
+	* Returns the height when the image orientation is top-left.
 	* @return int
 	*/
 	public function heightTopLeft() {
@@ -148,7 +148,7 @@ class OC_Image {
 	}
 
 	/**
-	 * @brief Outputs the image.
+	 * Outputs the image.
 	 * @param string $mimeType
 	 * @return bool
 	 */
@@ -161,7 +161,7 @@ class OC_Image {
 	}
 
 	/**
-	 * @brief Saves the image.
+	 * Saves the image.
 	 * @param string $filePath
 	 * @param string $mimeType
 	 * @return bool
@@ -181,7 +181,7 @@ class OC_Image {
 	}
 
 	/**
-	 * @brief Outputs/saves the image.
+	 * Outputs/saves the image.
 	 * @param string $filePath
 	 * @param string $mimeType
 	 * @return bool
@@ -259,7 +259,7 @@ class OC_Image {
 	}
 
 	/**
-	* @brief Prints the image when called as $image().
+	* Prints the image when called as $image().
 	*/
 	public function __invoke() {
 		return $this->show();
@@ -307,7 +307,7 @@ class OC_Image {
 
 	/**
 	* (I'm open for suggestions on better method name ;)
-	* @brief Get the orientation based on EXIF data.
+	* Get the orientation based on EXIF data.
 	* @return int The orientation or -1 if no EXIF data is available.
 	*/
 	public function getOrientation() {
@@ -335,7 +335,7 @@ class OC_Image {
 
 	/**
 	* (I'm open for suggestions on better method name ;)
-	* @brief Fixes orientation based on EXIF data.
+	* Fixes orientation based on EXIF data.
 	* @return bool.
 	*/
 	public function fixOrientation() {
@@ -396,7 +396,7 @@ class OC_Image {
 	}
 
 	/**
-	 * @brief Loads an image from a local file, a base64 encoded string or a resource created by an imagecreate* function.
+	 * Loads an image from a local file, a base64 encoded string or a resource created by an imagecreate* function.
 	 * @param resource|string $imageRef The path to a local file, a base64 encoded string or a resource created by an imagecreate* function or a file resource (file handle    ).
 	 * @return resource|false An image resource or false on error
 	 */
@@ -421,10 +421,10 @@ class OC_Image {
 	}
 
 	/**
-	* @brief Loads an image from an open file handle.
+	* Loads an image from an open file handle.
 	* It is the responsibility of the caller to position the pointer at the correct place and to close the handle again.
 	* @param resource $handle
-	* @return An image resource or false on error
+	* @return resource|false An image resource or false on error
 	*/
 	public function loadFromFileHandle($handle) {
 		OC_Log::write('core', __METHOD__.'(): Trying', OC_Log::DEBUG);
@@ -435,7 +435,7 @@ class OC_Image {
 	}
 
 	/**
-	* @brief Loads an image from a local file.
+	* Loads an image from a local file.
 	* @param bool|string $imagePath The path to a local file.
 	* @return bool|resource An image resource or false on error
 	*/
@@ -536,7 +536,7 @@ class OC_Image {
 	}
 
 	/**
-	* @brief Loads an image from a string of data.
+	* Loads an image from a string of data.
 	* @param string $str A string of image data as read from a file.
 	* @return bool|resource An image resource or false on error
 	*/
@@ -561,7 +561,7 @@ class OC_Image {
 	}
 
 	/**
-	* @brief Loads an image from a base64 encoded string.
+	* Loads an image from a base64 encoded string.
 	* @param string $str A string base64 encoded string of image data.
 	* @return bool|resource An image resource or false on error
 	*/
@@ -729,7 +729,7 @@ class OC_Image {
 	}
 
 	/**
-	* @brief Resizes the image preserving ratio.
+	* Resizes the image preserving ratio.
 	* @param integer $maxSize The maximum size of either the width or height.
 	* @return bool
 	*/
@@ -793,7 +793,7 @@ class OC_Image {
 	}
 
 	/**
-	* @brief Crops the image to the middle square. If the image is already square it just returns.
+	* Crops the image to the middle square. If the image is already square it just returns.
 	* @param int $size maximum size for the result (optional)
 	* @return bool for success or failure
 	*/
@@ -852,7 +852,7 @@ class OC_Image {
 	}
 
 	/**
-	* @brief Crops the image from point $x$y with dimension $wx$h.
+	* Crops the image from point $x$y with dimension $wx$h.
 	* @param int $x Horizontal position
 	* @param int $y Vertical position
 	* @param int $w Width
@@ -882,7 +882,7 @@ class OC_Image {
 	}
 
 	/**
-	 * @brief Resizes the image to fit within a boundry while preserving ratio.
+	 * Resizes the image to fit within a boundry while preserving ratio.
 	 * @param integer $maxWidth
 	 * @param integer $maxHeight
 	 * @return bool
diff --git a/lib/private/installer.php b/lib/private/installer.php
index 64e8e3a5e7..667c05c9c1 100644
--- a/lib/private/installer.php
+++ b/lib/private/installer.php
@@ -52,7 +52,7 @@ class OC_Installer{
 	 * It is the task of oc_app_install to create the tables and do whatever is
 	 * needed to get the app working.
 	 *
-	 * @brief Installs an app
+	 * Installs an app
 	 * @param array $data with all information
 	 * @throws \Exception
 	 * @return integer
@@ -219,9 +219,9 @@ class OC_Installer{
 	}
 
 	/**
-	 * @brief checks whether or not an app is installed
+	 * checks whether or not an app is installed
 	 * @param string $app app
-	 * @returns true/false
+	 * @return bool
 	 *
 	 * Checks whether or not an app is installed, i.e. registered in apps table.
 	 */
@@ -235,7 +235,7 @@ class OC_Installer{
 	}
 
 	/**
-	 * @brief Update an application
+	 * Update an application
 	 *
 	 * This function installs an app. All information needed are passed in the
 	 * associative array $data.
@@ -268,7 +268,7 @@ class OC_Installer{
 	}
 
 	/**
-	 * @brief Check if an update for the app is available
+	 * Check if an update for the app is available
 	 * @return string|false false or the version number of the update
 	 *
 	 * The function will check if an update for a version is available
@@ -295,7 +295,7 @@ class OC_Installer{
 	}
 
 	/**
-	 * @brief Check if app is already downloaded
+	 * Check if app is already downloaded
 	 * @param string $name name of the application to remove
 	 * @return boolean
 	 *
@@ -311,9 +311,9 @@ class OC_Installer{
 	}
 
 	/**
-	 * @brief Removes an app
+	 * Removes an app
 	 * @param string $name name of the application to remove
-	 * @param $options array with options
+	 * @param array $options options
 	 * @return boolean|null
 	 *
 	 * This function removes an app. $options is an associative array. The
@@ -364,7 +364,7 @@ class OC_Installer{
 	}
 
 	/**
-	 * @brief Installs shipped apps
+	 * Installs shipped apps
 	 *
 	 * This function installs all apps found in the 'apps' directory that should be enabled by default;
 	 */
diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index c7e4328161..3e44be8815 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -86,7 +86,7 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * @brief The constructor
+	 * The constructor
 	 * @param string $app app requesting l10n
 	 * @param string $lang default: null Language
 	 *
@@ -134,10 +134,10 @@ class OC_L10N implements \OCP\IL10N {
 			$i18ndir = self::findI18nDir($app);
 			// Localization is in /l10n, Texts are in $i18ndir
 			// (Just no need to define date/time format etc. twice)
-			if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')
-				|| OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/')
-				|| OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')
-				|| OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/')
+			if((OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')
+				|| OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/')
+				|| OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')
+				|| OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/')
 				)
 				&& file_exists($i18ndir.$lang.'.php')) {
 				// Include the file, save the data from $CONFIG
@@ -162,7 +162,7 @@ class OC_L10N implements \OCP\IL10N {
 				}
 			}
 
-			if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php') && OC_Helper::issubdirectory(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')) {
+			if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php') && OC_Helper::isSubDirectory(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')) {
 				// Include the file, save the data from $CONFIG
 				include OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php';
 				if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)) {
@@ -176,14 +176,14 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * @brief Creates a function that The constructor
+	 * Creates a function that The constructor
 	 *
 	 * If language is not set, the constructor tries to find the right
 	 * language.
 	 *
 	 * Parts of the code is copied from Habari:
 	 * https://github.com/habari/system/blob/master/classes/locale.php
-	 * @param $string string
+	 * @param string $string
 	 * @return string
 	 */
 	protected function createPluralFormFunction($string){
@@ -235,7 +235,7 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * @brief Translating
+	 * Translating
 	 * @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
@@ -248,7 +248,7 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * @brief Translating
+	 * Translating
 	 * @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
@@ -277,8 +277,8 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * @brief getTranslations
-	 * @returns array Fetch all translations
+	 * getTranslations
+	 * @return array Fetch all translations
 	 *
 	 * Returns an associative array with all translations
 	 */
@@ -288,8 +288,8 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * @brief getPluralFormString
-	 * @returns string containing the gettext "Plural-Forms"-string
+	 * getPluralFormString
+	 * @return string containing the gettext "Plural-Forms"-string
 	 *
 	 * Returns a string like "nplurals=2; plural=(n != 1);"
 	 */
@@ -299,8 +299,8 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * @brief getPluralFormFunction
-	 * @returns string the plural form function
+	 * getPluralFormFunction
+	 * @return string the plural form function
 	 *
 	 * returned function accepts the argument $n
 	 */
@@ -313,8 +313,8 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * @brief get localizations
-	 * @returns array Fetch all localizations
+	 * get localizations
+	 * @return array Fetch all localizations
 	 *
 	 * Returns an associative array with all localizations
 	 */
@@ -324,10 +324,10 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * @brief Localization
+	 * Localization
 	 * @param string $type Type of localization
-	 * @param array $data parameters for this localization
-	 * @returns String or false
+	 * @param array|int|string $data parameters for this localization
+	 * @return String or false
 	 *
 	 * Returns the localized data.
 	 *
@@ -379,9 +379,9 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * @brief Choose a language
+	 * Choose a language
 	 * @param array $text Associative Array with possible strings
-	 * @returns String
+	 * @return String
 	 *
 	 * $text is an array 'de' => 'hallo welt', 'en' => 'hello world', ...
 	 *
@@ -401,10 +401,27 @@ class OC_L10N implements \OCP\IL10N {
 		self::$language = $lang;
 	}
 
+
 	/**
-	 * @brief find the best language
+	 * find the best language
 	 * @param array|string $app details below
-	 * @returns string language
+	 * string language
+	 *
+	 * If $app is an array, ownCloud assumes that these are the available
+	 * languages. Otherwise ownCloud tries to find the files in the l10n
+	 * folder.
+	 *
+	 * If nothing works it returns 'en'
+	 */
+	public function getLanguageCode($app=null) {
+		return self::findLanguage($app);
+	}
+
+
+	/**
+	 * find the best language
+	 * @param array|string $app details below
+	 * @return string language
 	 *
 	 * If $app is an array, ownCloud assumes that these are the available
 	 * languages. Otherwise ownCloud tries to find the files in the l10n
@@ -475,9 +492,9 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * @brief find the l10n directory
+	 * find the l10n directory
 	 * @param string $app App that needs to be translated
-	 * @returns directory
+	 * @return directory
 	 */
 	protected static function findI18nDir($app) {
 		// find the i18n dir
@@ -495,9 +512,9 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * @brief find all available languages for an app
+	 * find all available languages for an app
 	 * @param string $app App that needs to be translated
-	 * @returns array an array of available languages
+	 * @return array an array of available languages
 	 */
 	public static function findAvailableLanguages($app=null) {
 		$available=array('en');//english is always available
@@ -517,7 +534,7 @@ class OC_L10N implements \OCP\IL10N {
 	/**
 	 * @param string $app
 	 * @param string $lang
-	 * @returns bool
+	 * @return bool
 	 */
 	public static function languageExists($app, $lang) {
 		if ($lang == 'en') {//english is always available
diff --git a/lib/private/l10n/factory.php b/lib/private/l10n/factory.php
index 8c65f36817..d0c3799b9c 100644
--- a/lib/private/l10n/factory.php
+++ b/lib/private/l10n/factory.php
@@ -20,8 +20,8 @@ class Factory {
 
 	/**
 	 * get an L10N instance
-	 * @param $app string
-	 * @param $lang string|null
+	 * @param string $app
+	 * @param string|null $lang
 	 * @return \OC_L10N
 	 */
 	public function get($app) {
diff --git a/lib/private/legacy/appconfig.php b/lib/private/legacy/appconfig.php
index cb5cef7e35..4634f2c695 100644
--- a/lib/private/legacy/appconfig.php
+++ b/lib/private/legacy/appconfig.php
@@ -34,8 +34,8 @@ class OC_Appconfig {
 	}
 
 	/**
-	 * @brief Get all apps using the config
-	 * @return array with app ids
+	 * Get all apps using the config
+	 * @return array an array of app ids
 	 *
 	 * This function returns a list of all apps that have at least one
 	 * entry in the appconfig table.
@@ -45,9 +45,9 @@ class OC_Appconfig {
 	}
 
 	/**
-	 * @brief Get the available keys for an app
+	 * Get the available keys for an app
 	 * @param string $app the app we are looking for
-	 * @return array with key names
+	 * @return array an array of key names
 	 *
 	 * This function gets all keys of an app. Please note that the values are
 	 * not returned.
@@ -57,7 +57,7 @@ class OC_Appconfig {
 	}
 
 	/**
-	 * @brief Gets the config value
+	 * Gets the config value
 	 * @param string $app app
 	 * @param string $key key
 	 * @param string $default = null, default value if the key does not exist
@@ -71,7 +71,7 @@ class OC_Appconfig {
 	}
 
 	/**
-	 * @brief check if a key is set in the appconfig
+	 * check if a key is set in the appconfig
 	 * @param string $app
 	 * @param string $key
 	 * @return bool
@@ -81,7 +81,7 @@ class OC_Appconfig {
 	}
 
 	/**
-	 * @brief sets a value in the appconfig
+	 * sets a value in the appconfig
 	 * @param string $app app
 	 * @param string $key key
 	 * @param string $value value
@@ -93,7 +93,7 @@ class OC_Appconfig {
 	}
 
 	/**
-	 * @brief Deletes a key
+	 * Deletes a key
 	 * @param string $app app
 	 * @param string $key key
 	 *
@@ -104,7 +104,7 @@ class OC_Appconfig {
 	}
 
 	/**
-	 * @brief Remove app from appconfig
+	 * Remove app from appconfig
 	 * @param string $app app
 	 *
 	 * Removes all keys in appconfig belonging to the app.
diff --git a/lib/private/legacy/cache.php b/lib/private/legacy/cache.php
deleted file mode 100644
index f915eb516b..0000000000
--- a/lib/private/legacy/cache.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Thomas Tanghus (thomas@tanghus.net)
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class OC_Cache extends \OC\Cache {
-}
\ No newline at end of file
diff --git a/lib/private/legacy/cache/fileglobalgc.php b/lib/private/legacy/cache/fileglobalgc.php
deleted file mode 100644
index 385f640667..0000000000
--- a/lib/private/legacy/cache/fileglobalgc.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-class OC_Cache_FileGlobalGC extends OC\Cache\FileGlobalGC{
-}
diff --git a/lib/private/legacy/config.php b/lib/private/legacy/config.php
index 6c2103179a..899c19532f 100644
--- a/lib/private/legacy/config.php
+++ b/lib/private/legacy/config.php
@@ -50,8 +50,8 @@ class OC_Config {
 	}
 
 	/**
-	 * @brief Lists all available config keys
-	 * @return array with key names
+	 * Lists all available config keys
+	 * @return array an array of key names
 	 *
 	 * This function returns all keys saved in config.php. Please note that it
 	 * does not return the values.
@@ -61,7 +61,7 @@ class OC_Config {
 	}
 
 	/**
-	 * @brief Gets a value from config.php
+	 * Gets a value from config.php
 	 * @param string $key key
 	 * @param mixed $default = null default value
 	 * @return mixed the value or $default
@@ -74,7 +74,7 @@ class OC_Config {
 	}
 
 	/**
-	 * @brief Sets a value
+	 * Sets a value
 	 * @param string $key key
 	 * @param mixed $value value
 	 *
@@ -86,7 +86,7 @@ class OC_Config {
 	}
 
 	/**
-	 * @brief Removes a key from the config
+	 * Removes a key from the config
 	 * @param string $key key
 	 *
 	 * This function removes a key from the config.php.
diff --git a/lib/private/legacy/filesystem.php b/lib/private/legacy/filesystem.php
deleted file mode 100644
index 34f92b357c..0000000000
--- a/lib/private/legacy/filesystem.php
+++ /dev/null
@@ -1,415 +0,0 @@
-<?php
-
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-/**
- * Class for abstraction of filesystem functions
- * This class won't call any filesystem functions for itself but but will pass them to the correct OC_Filestorage object
- * this class should also handle all the file permission related stuff
- *
- * Hooks provided:
- *   read(path)
- *   write(path, &run)
- *   post_write(path)
- *   create(path, &run) (when a file is created, both create and write will be emitted in that order)
- *   post_create(path)
- *   delete(path, &run)
- *   post_delete(path)
- *   rename(oldpath,newpath, &run)
- *   post_rename(oldpath,newpath)
- *   copy(oldpath,newpath, &run) (if the newpath doesn't exists yes, copy, create and write will be emitted in that order)
- *   post_rename(oldpath,newpath)
- *
- *   the &run parameter can be set to false to prevent the operation from occurring
- */
-
-/**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
-class OC_Filesystem {
-	/**
-	 * get the mountpoint of the storage object for a path
-	 * ( note: because a storage is not always mounted inside the fakeroot, the
-	 * returned mountpoint is relative to the absolute root of the filesystem
-	 * and doesn't take the chroot into account )
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param string $path
-	 * @return string
-	 */
-	static public function getMountPoint($path) {
-		return \OC\Files\Filesystem::getMountPoint($path);
-	}
-
-	/**
-	 * resolve a path to a storage and internal path
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param string $path
-	 * @return array consisting of the storage and the internal path
-	 */
-	static public function resolvePath($path) {
-		return \OC\Files\Filesystem::resolvePath($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function init($user, $root) {
-		return \OC\Files\Filesystem::init($user, $root);
-	}
-
-	/**
-	 * get the default filesystem view
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @return \OC\Files\View
-	 */
-	static public function getView() {
-		return \OC\Files\Filesystem::getView();
-	}
-
-	/**
-	 * tear down the filesystem, removing all storage providers
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function tearDown() {
-		\OC\Files\Filesystem::tearDown();
-	}
-
-	/**
-	 * @brief get the relative path of the root data directory for the current user
-	 * @return string
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * Returns path like /admin/files
-	 */
-	static public function getRoot() {
-		return \OC\Files\Filesystem::getRoot();
-	}
-
-	/**
-	 * clear all mounts and storage backends
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	public static function clearMounts() {
-		\OC\Files\Filesystem::clearMounts();
-	}
-
-	/**
-	 * mount an \OC\Files\Storage\Storage in our virtual filesystem
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param \OC\Files\Storage\Storage $class
-	 * @param array $arguments
-	 * @param string $mountpoint
-	 */
-	static public function mount($class, $arguments, $mountpoint) {
-		\OC\Files\Filesystem::mount($class, $arguments, $mountpoint);
-	}
-
-	/**
-	 * return the path to a local version of the file
-	 * we need this because we can't know if a file is stored local or not from
-	 * outside the filestorage and for some purposes a local file is needed
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param string $path
-	 * @return string
-	 */
-	static public function getLocalFile($path) {
-		return \OC\Files\Filesystem::getLocalFile($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param string $path
-	 * @return string
-	 */
-	static public function getLocalFolder($path) {
-		return \OC\Files\Filesystem::getLocalFolder($path);
-	}
-
-	/**
-	 * return path to file which reflects one visible in browser
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param string $path
-	 * @return string
-	 */
-	static public function getLocalPath($path) {
-		return \OC\Files\Filesystem::getLocalPath($path);
-	}
-
-	/**
-	 * check if the requested path is valid
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param string $path
-	 * @return bool
-	 */
-	static public function isValidPath($path) {
-		return \OC\Files\Filesystem::isValidPath($path);
-	}
-
-	/**
-	 * checks if a file is blacklisted for storage in the filesystem
-	 * Listens to write and rename hooks
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param array $data from hook
-	 */
-	static public function isBlacklisted($data) {
-		\OC\Files\Filesystem::isBlacklisted($data);
-	}
-
-	/**
-	 * following functions are equivalent to their php builtin equivalents for arguments/return values.
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function mkdir($path) {
-		return \OC\Files\Filesystem::mkdir($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function rmdir($path) {
-		return \OC\Files\Filesystem::rmdir($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function opendir($path) {
-		return \OC\Files\Filesystem::opendir($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function readdir($path) {
-		return \OC\Files\Filesystem::readdir($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function is_dir($path) {
-		return \OC\Files\Filesystem::is_dir($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function is_file($path) {
-		return \OC\Files\Filesystem::is_file($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function stat($path) {
-		return \OC\Files\Filesystem::stat($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function filetype($path) {
-		return \OC\Files\Filesystem::filetype($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function filesize($path) {
-		return \OC\Files\Filesystem::filesize($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function readfile($path) {
-		return \OC\Files\Filesystem::readfile($path);
-	}
-
-	/**
-	 * @deprecated Replaced by isReadable() as part of CRUDS
-	 */
-	static public function is_readable($path) {
-		return \OC\Files\Filesystem::isReadable($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function isCreatable($path) {
-		return \OC\Files\Filesystem::isCreatable($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function isReadable($path) {
-		return \OC\Files\Filesystem::isReadable($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function isUpdatable($path) {
-		return \OC\Files\Filesystem::isUpdatable($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function isDeletable($path) {
-		return \OC\Files\Filesystem::isDeletable($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function isSharable($path) {
-		return \OC\Files\Filesystem::isSharable($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function file_exists($path) {
-		return \OC\Files\Filesystem::file_exists($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function filemtime($path) {
-		return \OC\Files\Filesystem::filemtime($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function touch($path, $mtime = null) {
-		return \OC\Files\Filesystem::touch($path, $mtime);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function file_get_contents($path) {
-		return \OC\Files\Filesystem::file_get_contents($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function file_put_contents($path, $data) {
-		return \OC\Files\Filesystem::file_put_contents($path, $data);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function unlink($path) {
-		return \OC\Files\Filesystem::unlink($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function rename($path1, $path2) {
-		return \OC\Files\Filesystem::rename($path1, $path2);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function copy($path1, $path2) {
-		return \OC\Files\Filesystem::copy($path1, $path2);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function fopen($path, $mode) {
-		return \OC\Files\Filesystem::fopen($path, $mode);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function toTmpFile($path) {
-		return \OC\Files\Filesystem::toTmpFile($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function fromTmpFile($tmpFile, $path) {
-		return \OC\Files\Filesystem::fromTmpFile($tmpFile, $path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function getMimeType($path) {
-		return \OC\Files\Filesystem::getMimeType($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function hash($type, $path, $raw = false) {
-		return \OC\Files\Filesystem::hash($type, $path, $raw);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function free_space($path = '/') {
-		return \OC\Files\Filesystem::free_space($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function search($query) {
-		return \OC\Files\Filesystem::search($query);
-	}
-
-	/**
-	 * check if a file or folder has been updated since $time
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param string $path
-	 * @param int $time
-	 * @return bool
-	 */
-	static public function hasUpdated($path, $time) {
-		return \OC\Files\Filesystem::hasUpdated($path, $time);
-	}
-
-	/**
-	 * normalize a path
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param string $path
-	 * @param bool $stripTrailingSlash
-	 * @return string
-	 */
-	public static function normalizePath($path, $stripTrailingSlash = true) {
-		return \OC\Files\Filesystem::normalizePath($path, $stripTrailingSlash);
-	}
-}
diff --git a/lib/private/legacy/filesystemview.php b/lib/private/legacy/filesystemview.php
deleted file mode 100644
index d6bca62e06..0000000000
--- a/lib/private/legacy/filesystemview.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file. */
-
-class OC_FilesystemView extends \OC\Files\View {}
diff --git a/lib/private/legacy/preferences.php b/lib/private/legacy/preferences.php
index fcde12796c..71d0b749f4 100644
--- a/lib/private/legacy/preferences.php
+++ b/lib/private/legacy/preferences.php
@@ -28,8 +28,8 @@ OC_Preferences::$object = new \OC\Preferences(OC_DB::getConnection());
 class OC_Preferences{
 	public static $object;
 	/**
-	 * @brief Get all users using the preferences
-	 * @return array with user ids
+	 * Get all users using the preferences
+	 * @return array an array of user ids
 	 *
 	 * This function returns a list of all users that have at least one entry
 	 * in the preferences table.
@@ -39,7 +39,7 @@ class OC_Preferences{
 	}
 
 	/**
-	 * @brief Get all apps of a user
+	 * Get all apps of a user
 	 * @param string $user user
 	 * @return integer[] with app ids
 	 *
@@ -51,10 +51,10 @@ class OC_Preferences{
 	}
 
 	/**
-	 * @brief Get the available keys for an app
+	 * Get the available keys for an app
 	 * @param string $user user
 	 * @param string $app the app we are looking for
-	 * @return array with key names
+	 * @return array an array of key names
 	 *
 	 * This function gets all keys of an app of an user. Please note that the
 	 * values are not returned.
@@ -64,7 +64,7 @@ class OC_Preferences{
 	}
 
 	/**
-	 * @brief Gets the preference
+	 * Gets the preference
 	 * @param string $user user
 	 * @param string $app app
 	 * @param string $key key
@@ -79,7 +79,7 @@ class OC_Preferences{
 	}
 
 	/**
-	 * @brief sets a value in the preferences
+	 * sets a value in the preferences
 	 * @param string $user user
 	 * @param string $app app
 	 * @param string $key key
@@ -95,7 +95,7 @@ class OC_Preferences{
 	}
 
 	/**
-	 * @brief Deletes a key
+	 * Deletes a key
 	 * @param string $user user
 	 * @param string $app app
 	 * @param string $key key
@@ -108,7 +108,7 @@ class OC_Preferences{
 	}
 
 	/**
-	 * @brief Remove app of user from preferences
+	 * Remove app of user from preferences
 	 * @param string $user user
 	 * @param string $app app
 	 * @return bool
@@ -121,7 +121,7 @@ class OC_Preferences{
 	}
 
 	/**
-	 * @brief Remove user from preferences
+	 * Remove user from preferences
 	 * @param string $user user
 	 * @return bool
 	 *
@@ -133,7 +133,7 @@ class OC_Preferences{
 	}
 
 	/**
-	 * @brief Remove app from all users
+	 * Remove app from all users
 	 * @param string $app app
 	 * @return bool
 	 *
diff --git a/lib/private/log.php b/lib/private/log.php
index e0b9fe3c69..98465ec40e 100644
--- a/lib/private/log.php
+++ b/lib/private/log.php
@@ -8,6 +8,8 @@
 
 namespace OC;
 
+use \OCP\ILogger;
+
 /**
  * logging utilities
  *
@@ -18,8 +20,24 @@ namespace OC;
  * MonoLog is an example implementing this interface.
  */
 
-class Log {
-	private $logClass;
+class Log implements ILogger {
+
+	private $logger;
+
+	/**
+	 * @param string $logger The logger that should be used
+	 */
+	public function __construct($logger=null) {
+		// FIXME: Add this for backwards compatibility, should be fixed at some point probably
+		if($logger === null) {
+			$this->logger = 'OC_Log_'.ucfirst(\OC_Config::getValue('log_type', 'owncloud'));
+			call_user_func(array($this->logger, 'init'));
+		} else {
+			$this->logger = $logger;
+		}
+
+	}
+
 
 	/**
 	 * System is unusable.
@@ -112,10 +130,6 @@ class Log {
 		$this->log(\OC_Log::DEBUG, $message, $context);
 	}
 
-	public function __construct() {
-		$this->logClass = 'OC_Log_'.ucfirst(\OC_Config::getValue('log_type', 'owncloud'));
-		call_user_func(array($this->logClass, 'init'));
-	}
 
 	/**
 	 * Logs with an arbitrary level.
@@ -130,7 +144,16 @@ class Log {
 		} else {
 			$app = 'no app in context';
 		}
-		$logClass=$this->logClass;
-		$logClass::write($app, $message, $level);
+		// interpolate $message as defined in PSR-3
+		$replace = array();
+		foreach ($context as $key => $val) {
+			$replace['{' . $key . '}'] = $val;
+		}
+
+		// interpolate replacement values into the message and return
+		$message = strtr($message, $replace);
+
+		$logger = $this->logger;
+		$logger::write($app, $message, $level);
 	}
 }
diff --git a/lib/private/log/errorhandler.php b/lib/private/log/errorhandler.php
index 1dde6b507f..4345b3f6b7 100644
--- a/lib/private/log/errorhandler.php
+++ b/lib/private/log/errorhandler.php
@@ -15,7 +15,7 @@ class ErrorHandler {
 	private static $logger;
 
 	/**
-	 * @brief remove password in URLs
+	 * remove password in URLs
 	 * @param string $msg
 	 * @return string
 	 */
diff --git a/lib/private/memcache/memcached.php b/lib/private/memcache/memcached.php
index 075828eeba..cd8e2e8d0b 100644
--- a/lib/private/memcache/memcached.php
+++ b/lib/private/memcache/memcached.php
@@ -57,7 +57,7 @@ class Memcached extends Cache {
 
 	public function hasKey($key) {
 		self::$cache->get($this->getNamespace() . $key);
-		return self::$cache->getResultCode() !== \Memcached::RES_NOTFOUND;
+		return self::$cache->getResultCode() === \Memcached::RES_SUCCESS;
 	}
 
 	public function remove($key) {
diff --git a/lib/private/migrate.php b/lib/private/migrate.php
index 5bcc11b061..8d88181ca1 100644
--- a/lib/private/migrate.php
+++ b/lib/private/migrate.php
@@ -53,7 +53,7 @@ class OC_Migrate{
 	}
 
 	/**
-	* @brief finds and loads the providers
+	* finds and loads the providers
 	*/
 	static private function findProviders() {
 		// Find the providers
@@ -68,7 +68,7 @@ class OC_Migrate{
 	}
 
 	/**
-	 * @brief exports a user, or owncloud instance
+	 * exports a user, or owncloud instance
 	 * @param string $uid user id of user to export if export type is user, defaults to current
 	 * @param string $type type of export, defualts to user
 	 * @param string $path path to zip output folder
@@ -192,7 +192,7 @@ class OC_Migrate{
 	}
 
 	/**
-	 * @brief imports a user, or owncloud instance
+	 * imports a user, or owncloud instance
 	 * @param string $path path to zip
 	 * @param string $type type of import (user or instance)
 	 * @param string|null|int $uid userid of new user
@@ -307,7 +307,7 @@ class OC_Migrate{
 	}
 
 	/**
-	* @brief recursively deletes a directory
+	* recursively deletes a directory
 	* @param string $dir path of dir to delete
 	* @param bool $deleteRootToo delete the root directory
 	* @return bool
@@ -332,8 +332,8 @@ class OC_Migrate{
 	}
 
 	/**
-	* @brief tries to extract the import zip
-	* @param $path string path to the zip
+	* tries to extract the import zip
+	* @param string $path path to the zip
 	* @return string path to extract location (with a trailing slash) or false on failure
 	*/
 	static private function extractZip( $path ) {
@@ -356,7 +356,7 @@ class OC_Migrate{
 	}
 
 	/**
-	 * @brief creates a migration.db in the users data dir with their app data in
+	 * creates a migration.db in the users data dir with their app data in
 	 * @return bool whether operation was successfull
 	 */
 	private static function exportAppData( ) {
@@ -406,7 +406,7 @@ class OC_Migrate{
 
 
 	/**
-	 * @brief generates json containing export info, and merges any data supplied
+	 * generates json containing export info, and merges any data supplied
 	 * @param array $array of data to include in the returned json
 	 * @return string
 	 */
@@ -430,7 +430,7 @@ class OC_Migrate{
 	}
 
 	/**
-	 * @brief connects to migration.db, or creates if not found
+	 * connects to migration.db, or creates if not found
 	 * @param string $path to migration.db, defaults to user data dir
 	 * @return bool whether the operation was successful
 	 */
@@ -460,7 +460,7 @@ class OC_Migrate{
 	}
 
 	/**
-	 * @brief creates the tables in migration.db from an apps database.xml
+	 * creates the tables in migration.db from an apps database.xml
 	 * @param string $appid id of the app
 	 * @return bool whether the operation was successful
 	 */
@@ -498,7 +498,7 @@ class OC_Migrate{
 	}
 
 	/**
-	* @brief tries to create the zip
+	* tries to create the zip
 	* @return bool
 	*/
 	static private function createZip() {
@@ -519,7 +519,7 @@ class OC_Migrate{
 	}
 
 	/**
-	* @brief returns an array of apps that support migration
+	* returns an array of apps that support migration
 	* @return array
 	*/
 	static public function getApps() {
@@ -534,11 +534,11 @@ class OC_Migrate{
 	}
 
 	/**
-	* @brief imports a new user
+	* imports a new user
 	* @param string $db string path to migration.db
-	* @param $info object of migration info
+	* @param object $info object of migration info
 	* @param string|null|int $uid uid to use
-	* @return array of apps with import statuses, or false on failure.
+	* @return array an array of apps with import statuses, or false on failure.
 	*/
 	public static function importAppData( $db, $info, $uid=null ) {
 		// Check if the db exists
diff --git a/lib/private/migration/content.php b/lib/private/migration/content.php
index b0e7a4e952..cb5d9ad147 100644
--- a/lib/private/migration/content.php
+++ b/lib/private/migration/content.php
@@ -33,9 +33,9 @@ class OC_Migration_Content{
 	private $tmpfiles=array();
 
 	/**
-	* @brief sets up the
+	* sets up the
 	* @param ZipArchive $zip ZipArchive object
-	* @param $db a database object (required for exporttype user)
+	* @param object $db a database object (required for exporttype user)
 	* @return bool|null
 	*/
 	public function __construct( $zip, $db=null ) {
@@ -45,11 +45,9 @@ class OC_Migration_Content{
 
 	}
 
-	// @brief prepares the db
-	// @param $query the sql query to prepare
-
 	/**
-	 * @param string $query
+	 * prepares the db
+	 * @param string $query the sql query to prepare
 	 */
 	public function prepare( $query ) {
 
@@ -73,7 +71,7 @@ class OC_Migration_Content{
 	}
 
 	/**
-	* @brief processes the db query
+	* processes the db query
 	* @param string $query the query to process
 	* @return string of processed query
 	*/
@@ -87,8 +85,8 @@ class OC_Migration_Content{
 	}
 
 	/**
-	* @brief copys rows to migration.db from the main database
-	* @param $options array of options.
+	* copys rows to migration.db from the main database
+	* @param array $options array of options.
 	* @return bool
 	*/
 	public function copyRows( $options ) {
@@ -129,9 +127,9 @@ class OC_Migration_Content{
 	}
 
 	/**
-	* @brief saves a sql data set into migration.db
+	* saves a sql data set into migration.db
 	* @param OC_DB_StatementWrapper $data a sql data set returned from self::prepare()->query()
-	* @param $options array of copyRows options
+	* @param array $options array of copyRows options
 	* @return void
 	*/
 	private function insertData( $data, $options ) {
@@ -168,10 +166,10 @@ class OC_Migration_Content{
 	}
 
 	/**
-	* @brief adds a directory to the zip object
+	* adds a directory to the zip object
 	* @param boolean|string $dir string path of the directory to add
-	* @param $recursive bool
-	* @param $internaldir string path of folder to add dir to in zip
+	* @param bool $recursive
+	* @param string $internaldir path of folder to add dir to in zip
 	* @return bool
 	*/
 	public function addDir( $dir, $recursive=true, $internaldir='' ) {
@@ -203,7 +201,7 @@ class OC_Migration_Content{
 	}
 
 	/**
-	* @brief adds a file to the zip from a given string
+	* adds a file to the zip from a given string
 	* @param string $data string of data to add
 	* @param string $path the relative path inside of the zip to save the file to
 	* @return bool
@@ -222,7 +220,7 @@ class OC_Migration_Content{
 	}
 
 	/**
-	* @brief closes the zip, removes temp files
+	* closes the zip, removes temp files
 	* @return bool
 	*/
 	public function finish() {
@@ -237,7 +235,7 @@ class OC_Migration_Content{
 	}
 
 		/**
-	* @brief cleans up after the zip
+	* cleans up after the zip
 	*/
 	private function cleanup() {
 		// Delete tmp files
diff --git a/lib/private/migration/provider.php b/lib/private/migration/provider.php
index 2829a97a77..a7c611dcdd 100644
--- a/lib/private/migration/provider.php
+++ b/lib/private/migration/provider.php
@@ -17,19 +17,19 @@ abstract class OC_Migration_Provider{
 	}
 
 	/**
-	 * @brief exports data for apps
+	 * exports data for apps
 	 * @return array appdata to be exported
 	 */
 	abstract function export( );
 
 	/**
-	 * @brief imports data for the app
+	 * imports data for the app
 	 * @return void
 	 */
 	abstract function import( );
 
 	/**
-	* @brief sets the OC_Migration_Content object to $this->content
+	* sets the OC_Migration_Content object to $this->content
 	* @param OC_Migration_Content $content a OC_Migration_Content object
 	*/
 	public function setData( $uid, $content, $info=null ) {
@@ -43,7 +43,7 @@ abstract class OC_Migration_Provider{
 	}
 
 	/**
-	* @brief returns the appid of the provider
+	* returns the appid of the provider
 	* @return string
 	*/
 	public function getID() {
diff --git a/lib/private/navigationmanager.php b/lib/private/navigationmanager.php
index 1f657b9ad8..8ad2f4c8f6 100644
--- a/lib/private/navigationmanager.php
+++ b/lib/private/navigationmanager.php
@@ -29,15 +29,15 @@ class NavigationManager implements \OCP\INavigationManager {
 	}
 
 	/**
-	 * @brief returns all the added Menu entries
-	 * @return array of the added entries
+	 * returns all the added Menu entries
+	 * @return array an array of the added entries
 	 */
 	public function getAll() {
 		return $this->entries;
 	}
 
 	/**
-	 * @brief removes all the entries
+	 * removes all the entries
 	 */
 	public function clear() {
 		$this->entries = array();
@@ -52,7 +52,7 @@ class NavigationManager implements \OCP\INavigationManager {
 	}
 
 	/**
-	 * @brief gets the active Menu entry
+	 * gets the active Menu entry
 	 * @return string id or empty string
 	 *
 	 * This function returns the id of the active navigation entry (set by
diff --git a/lib/private/ocs.php b/lib/private/ocs.php
index 211e822214..aeb3d259b3 100644
--- a/lib/private/ocs.php
+++ b/lib/private/ocs.php
@@ -213,8 +213,8 @@ class OC_OCS {
 	}
 
 	/**
-	 * @param $writer
-	 * @param $data
+	 * @param resource $writer
+	 * @param array $data
 	 * @param string $node
 	 */
 	public static function toXml($writer, $data, $node) {
diff --git a/lib/private/ocs/cloud.php b/lib/private/ocs/cloud.php
index c8bb9425f1..3ced0af8ee 100644
--- a/lib/private/ocs/cloud.php
+++ b/lib/private/ocs/cloud.php
@@ -57,8 +57,8 @@ class OC_OCS_Cloud {
 	 *   </quota>
 	 * </data>
 	 *
-	 * @param $parameters object should contain parameter 'userid' which identifies
-	 *                           the user from whom the information will be returned
+	 * @param array $parameters should contain parameter 'userid' which identifies
+	 *                          the user from whom the information will be returned
 	 */
 	public static function getUser($parameters) {
 		$return  = array();
diff --git a/lib/private/ocs/result.php b/lib/private/ocs/result.php
index 0e3b85d590..567fe7f87f 100644
--- a/lib/private/ocs/result.php
+++ b/lib/private/ocs/result.php
@@ -26,7 +26,7 @@ class OC_OCS_Result{
 
 	/**
 	 * create the OCS_Result object
-	 * @param $data mixed the data to return
+	 * @param mixed $data the data to return
 	 */
 	public function __construct($data=null, $code=100, $message=null) {
 		if ($data === null) {
@@ -42,7 +42,7 @@ class OC_OCS_Result{
 
 	/**
 	 * optionally set the total number of items available
-	 * @param $items int
+	 * @param int $items
 	 */
 	public function setTotalItems(int $items) {
 		$this->items = $items;
@@ -50,7 +50,7 @@ class OC_OCS_Result{
 
 	/**
 	 * optionally set the the number of items per page
-	 * @param $items int
+	 * @param int $items
 	 */
 	public function setItemsPerPage(int $items) {
 		$this->perPage = $items;
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
index b0480caf02..39d7e9cccc 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -29,8 +29,8 @@
 class OC_OCSClient{
 
 	/**
-	 * @brief Get the url of the OCS AppStore server.
-	 * @returns string of the AppStore server
+	 * Get the url of the OCS AppStore server.
+	 * @return string of the AppStore server
 	 *
 	 * This function returns the url of the OCS AppStore server. It´s possible
 	 * to set it in the config file or it will fallback to the default
@@ -47,8 +47,8 @@ class OC_OCSClient{
 
 
 	/**
-	 * @brief Get the content of an OCS url call.
-	 * @returns string of the response
+	 * Get the content of an OCS url call.
+	 * @return string of the response
 	 * This function calls an OCS server and returns the response. It also sets a sane timeout
 	* @param string $url
 	*/
@@ -58,8 +58,8 @@ class OC_OCSClient{
 	}
 
 	/**
-	 * @brief Get all the categories from the OCS server
-	 * @returns array with category ids
+	 * Get all the categories from the OCS server
+	 * @return array an array of category ids
 	 * @note returns NULL if config value appstoreenabled is set to false
 	 * This function returns a list of all the application categories on the OCS server
 	 */
@@ -91,11 +91,11 @@ class OC_OCSClient{
 	}
 
 	/**
-	 * @brief Get all the applications from the OCS server
-	 * @returns array with application data
+	 * Get all the applications from the OCS server
+	 * @return array an array of application data
 	 *
 	 * This function returns a list of all the applications on the OCS server
-	 * @param $categories
+	 * @param array|string $categories
 	 * @param int $page
 	 * @param string $filter
 	 */
@@ -148,9 +148,9 @@ class OC_OCSClient{
 
 
 	/**
-	 * @brief Get an the applications from the OCS server
+	 * Get an the applications from the OCS server
 	 * @param string $id
-	 * @returns array with application data
+	 * @return array an array of application data
 	 *
 	 * This function returns an  applications from the OCS server
 	 */
@@ -191,8 +191,8 @@ class OC_OCSClient{
 	}
 
 	/**
-	 * @brief Get the download url for an application from the OCS server
-	 * @returns array with application data
+	 * Get the download url for an application from the OCS server
+	 * @return array an array of application data
 	 *
 	 * This function returns an download url for an applications from the OCS server
 	 * @param string $id
diff --git a/lib/private/preferences.php b/lib/private/preferences.php
index d45e6e7708..e6d9f28b1d 100644
--- a/lib/private/preferences.php
+++ b/lib/private/preferences.php
@@ -68,8 +68,8 @@ class Preferences {
 	}
 
 	/**
-	 * @brief Get all users using the preferences
-	 * @return array with user ids
+	 * Get all users using the preferences
+	 * @return array an array of user ids
 	 *
 	 * This function returns a list of all users that have at least one entry
 	 * in the preferences table.
@@ -109,7 +109,7 @@ class Preferences {
 	}
 
 	/**
-	 * @brief Get all apps of an user
+	 * Get all apps of an user
 	 * @param string $user user
 	 * @return integer[] with app ids
 	 *
@@ -122,10 +122,10 @@ class Preferences {
 	}
 
 	/**
-	 * @brief Get the available keys for an app
+	 * Get the available keys for an app
 	 * @param string $user user
 	 * @param string $app the app we are looking for
-	 * @return array with key names
+	 * @return array an array of key names
 	 *
 	 * This function gets all keys of an app of an user. Please note that the
 	 * values are not returned.
@@ -140,7 +140,7 @@ class Preferences {
 	}
 
 	/**
-	 * @brief Gets the preference
+	 * Gets the preference
 	 * @param string $user user
 	 * @param string $app app
 	 * @param string $key key
@@ -160,7 +160,7 @@ class Preferences {
 	}
 
 	/**
-	 * @brief sets a value in the preferences
+	 * sets a value in the preferences
 	 * @param string $user user
 	 * @param string $app app
 	 * @param string $key key
@@ -206,7 +206,7 @@ class Preferences {
 	}
 
 	/**
-	 * @brief Deletes a key
+	 * Deletes a key
 	 * @param string $user user
 	 * @param string $app app
 	 * @param string $key key
@@ -227,7 +227,7 @@ class Preferences {
 	}
 
 	/**
-	 * @brief Remove app of user from preferences
+	 * Remove app of user from preferences
 	 * @param string $user user
 	 * @param string $app app
 	 *
@@ -246,7 +246,7 @@ class Preferences {
 	}
 
 	/**
-	 * @brief Remove user from preferences
+	 * Remove user from preferences
 	 * @param string $user user
 	 *
 	 * Removes all keys in preferences belonging to the user.
@@ -261,7 +261,7 @@ class Preferences {
 	}
 
 	/**
-	 * @brief Remove app from all users
+	 * Remove app from all users
 	 * @param string $app app
 	 *
 	 * Removes all keys in preferences belonging to the app.
diff --git a/lib/private/preview.php b/lib/private/preview.php
index cdf2224038..8089379bde 100755
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -43,6 +43,7 @@ class Preview {
 	private $maxY;
 	private $scalingUp;
 	private $mimeType;
+	private $keepAspect = false;
 
 	//filemapper used for deleting previews
 	// index is path, value is fileinfo
@@ -65,7 +66,7 @@ class Preview {
 	protected $info;
 
 	/**
-	 * @brief check if thumbnail or bigger version of thumbnail of file is cached
+	 * check if thumbnail or bigger version of thumbnail of file is cached
 	 * @param string $user userid - if no user is given, OC_User::getUser will be used
 	 * @param string $root path of root
 	 * @param string $file The path to the file where you want a thumbnail from
@@ -110,7 +111,7 @@ class Preview {
 	}
 
 	/**
-	 * @brief returns the path of the file you want a thumbnail from
+	 * returns the path of the file you want a thumbnail from
 	 * @return string
 	 */
 	public function getFile() {
@@ -118,7 +119,7 @@ class Preview {
 	}
 
 	/**
-	 * @brief returns the max width of the preview
+	 * returns the max width of the preview
 	 * @return integer
 	 */
 	public function getMaxX() {
@@ -126,7 +127,7 @@ class Preview {
 	}
 
 	/**
-	 * @brief returns the max height of the preview
+	 * returns the max height of the preview
 	 * @return integer
 	 */
 	public function getMaxY() {
@@ -134,7 +135,7 @@ class Preview {
 	}
 
 	/**
-	 * @brief returns whether or not scalingup is enabled
+	 * returns whether or not scalingup is enabled
 	 * @return bool
 	 */
 	public function getScalingUp() {
@@ -142,7 +143,7 @@ class Preview {
 	}
 
 	/**
-	 * @brief returns the name of the thumbnailfolder
+	 * returns the name of the thumbnailfolder
 	 * @return string
 	 */
 	public function getThumbnailsFolder() {
@@ -150,7 +151,7 @@ class Preview {
 	}
 
 	/**
-	 * @brief returns the max scale factor
+	 * returns the max scale factor
 	 * @return string
 	 */
 	public function getMaxScaleFactor() {
@@ -158,7 +159,7 @@ class Preview {
 	}
 
 	/**
-	 * @brief returns the max width set in ownCloud's config
+	 * returns the max width set in ownCloud's config
 	 * @return string
 	 */
 	public function getConfigMaxX() {
@@ -166,7 +167,7 @@ class Preview {
 	}
 
 	/**
-	 * @brief returns the max height set in ownCloud's config
+	 * returns the max height set in ownCloud's config
 	 * @return string
 	 */
 	public function getConfigMaxY() {
@@ -188,9 +189,9 @@ class Preview {
 	}
 
 	/**
-	 * @brief set the path of the file you want a thumbnail from
+	 * set the path of the file you want a thumbnail from
 	 * @param string $file
-	 * @return $this
+	 * @return \OC\Preview $this
 	 */
 	public function setFile($file) {
 		$this->file = $file;
@@ -205,7 +206,7 @@ class Preview {
 	}
 
 	/**
-	 * @brief set mime type explicitly
+	 * set mime type explicitly
 	 * @param string $mimeType
 	 */
 	public function setMimetype($mimeType) {
@@ -213,10 +214,10 @@ class Preview {
 	}
 
 	/**
-	 * @brief set the the max width of the preview
+	 * set the the max width of the preview
 	 * @param int $maxX
 	 * @throws \Exception
-	 * @return $this
+	 * @return \OC\Preview $this
 	 */
 	public function setMaxX($maxX = 1) {
 		if ($maxX <= 0) {
@@ -234,10 +235,10 @@ class Preview {
 	}
 
 	/**
-	 * @brief set the the max height of the preview
+	 * set the the max height of the preview
 	 * @param int $maxY
 	 * @throws \Exception
-	 * @return $this
+	 * @return \OC\Preview $this
 	 */
 	public function setMaxY($maxY = 1) {
 		if ($maxY <= 0) {
@@ -255,9 +256,9 @@ class Preview {
 	}
 
 	/**
-	 * @brief set whether or not scalingup is enabled
+	 * set whether or not scalingup is enabled
 	 * @param bool $scalingUp
-	 * @return $this
+	 * @return \OC\Preview $this
 	 */
 	public function setScalingup($scalingUp) {
 		if ($this->getMaxScaleFactor() === 1) {
@@ -267,8 +268,13 @@ class Preview {
 		return $this;
 	}
 
+	public function setKeepAspect($keepAspect) {
+		$this->keepAspect = $keepAspect;
+		return $this;
+	}
+
 	/**
-	 * @brief check if all parameters are valid
+	 * check if all parameters are valid
 	 * @return bool
 	 */
 	public function isFileValid() {
@@ -287,7 +293,7 @@ class Preview {
 	}
 
 	/**
-	 * @brief deletes previews of a file with specific x and y
+	 * deletes previews of a file with specific x and y
 	 * @return bool
 	 */
 	public function deletePreview() {
@@ -297,14 +303,14 @@ class Preview {
 		if($fileInfo !== null && $fileInfo !== false) {
 			$fileId = $fileInfo->getId();
 
-			$previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/' . $this->getMaxX() . '-' . $this->getMaxY() . '.png';
+			$previewPath = $this->buildCachePath($fileId);
 			return $this->userView->unlink($previewPath);
 		}
 		return false;
 	}
 
 	/**
-	 * @brief deletes all previews of a file
+	 * deletes all previews of a file
 	 * @return bool
 	 */
 	public function deleteAllPreviews() {
@@ -322,7 +328,7 @@ class Preview {
 	}
 
 	/**
-	 * @brief check if thumbnail or bigger version of thumbnail of file is cached
+	 * check if thumbnail or bigger version of thumbnail of file is cached
 	 * @param int $fileId fileId of the original image
 	 * @return string|false path to thumbnail if it exists or false
 	 */
@@ -330,22 +336,19 @@ class Preview {
 		if (is_null($fileId)) {
 			return false;
 		}
-		
-		$maxX = $this->getMaxX();
-		$maxY = $this->getMaxY();
 
-		$previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/';
+		$preview = $this->buildCachePath($fileId);
 
 		//does a preview with the wanted height and width already exist?
-		if ($this->userView->file_exists($previewPath . $maxX . '-' . $maxY . '.png')) {
-			return $previewPath . $maxX . '-' . $maxY . '.png';
+		if ($this->userView->file_exists($preview)) {
+			return $preview;
 		}
 
 		return $this->isCachedBigger($fileId);
 	}
 
 	/**
-	 * @brief check if a bigger version of thumbnail of file is cached
+	 * check if a bigger version of thumbnail of file is cached
 	 * @param int $fileId fileId of the original image
 	 * @return string|false path to bigger thumbnail if it exists or false
 	*/
@@ -355,6 +358,11 @@ class Preview {
 			return false;
 		}
 
+		// in order to not loose quality we better generate aspect preserving previews from the original file
+		if ($this->keepAspect) {
+			return false;
+		}
+
 		$maxX = $this->getMaxX();
 
 		//array for usable cached thumbnails
@@ -372,9 +380,9 @@ class Preview {
 	}
 
 	/**
-	 * @brief get possible bigger thumbnails of the given image
+	 * get possible bigger thumbnails of the given image
 	 * @param int $fileId fileId of the original image
-	 * @return array of paths to bigger thumbnails
+	 * @return array an array of paths to bigger thumbnails
 	*/
 	private function getPossibleThumbnails($fileId) {
 
@@ -425,12 +433,12 @@ class Preview {
 	 * @return bool
 	 */
 	private function unscalable($x, $y) {
-		
+
 		$maxX = $this->getMaxX();
 		$maxY = $this->getMaxY();
 		$scalingUp = $this->getScalingUp();
 		$maxScaleFactor = $this->getMaxScaleFactor();
-		
+
 		if ($x < $maxX || $y < $maxY) {
 			if ($scalingUp) {
 				$scalefactor = $maxX / $x;
@@ -445,7 +453,7 @@ class Preview {
 	}
 
 	/**
-	 * @brief return a preview of a file
+	 * return a preview of a file
 	 * @return \OC_Image
 	 */
 	public function getPreview() {
@@ -466,12 +474,12 @@ class Preview {
 		$fileId = $fileInfo->getId();
 
 		$cached = $this->isCached($fileId);
-
 		if ($cached) {
 			$stream = $this->userView->fopen($cached, 'r');
 			$image = new \OC_Image();
 			$image->loadFromFileHandle($stream);
 			$this->preview = $image->valid() ? $image : null;
+
 			$this->resizeAndCrop();
 			fclose($stream);
 		}
@@ -497,7 +505,7 @@ class Preview {
 				$this->resizeAndCrop();
 
 				$previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/';
-				$cachePath = $previewPath . $maxX . '-' . $maxY . '.png';
+				$cachePath = $this->buildCachePath($fileId);
 
 				if ($this->userView->is_dir($this->getThumbnailsFolder() . '/') === false) {
 					$this->userView->mkdir($this->getThumbnailsFolder() . '/');
@@ -521,27 +529,19 @@ class Preview {
 	}
 
 	/**
-	 * @brief show preview
+	 * show preview
 	 * @return void
 	 */
-	public function showPreview() {
+	public function showPreview($mimeType = null) {
 		\OCP\Response::enableCaching(3600 * 24); // 24 hours
 		if (is_null($this->preview)) {
 			$this->getPreview();
 		}
-		$this->preview->show('image/png');
+		$this->preview->show($mimeType);
 	}
 
 	/**
-	 * @brief show preview
-	 * @return void
-	 */
-	public function show() {
-		$this->showPreview();
-	}
-
-	/**
-	 * @brief resize, crop and fix orientation
+	 * resize, crop and fix orientation
 	 * @return void
 	 */
 	private function resizeAndCrop() {
@@ -561,6 +561,11 @@ class Preview {
 		$realX = (int)$image->width();
 		$realY = (int)$image->height();
 
+		// compute $maxY using the aspect of the generated preview
+		if ($this->keepAspect) {
+			$y = $x / ($realX / $realY);
+		}
+
 		if ($x === $realX && $y === $realY) {
 			$this->preview = $image;
 			return;
@@ -610,7 +615,7 @@ class Preview {
 			return;
 		}
 
-		if ($newXSize < $x || $newYSize < $y) {
+		if (($newXSize < $x || $newYSize < $y) && $scalingUp) {
 			if ($newXSize > $x) {
 				$cropX = floor(($newXSize - $x) * 0.5);
 				$image->crop($cropX, 0, $x, $newYSize);
@@ -647,7 +652,7 @@ class Preview {
 	}
 
 	/**
-	 * @brief register a new preview provider to be used
+	 * register a new preview provider to be used
 	 * @param array $options
 	 * @return void
 	 */
@@ -656,7 +661,7 @@ class Preview {
 	}
 
 	/**
-	 * @brief create instances of all the registered preview providers
+	 * create instances of all the registered preview providers
 	 * @return void
 	 */
 	private static function initProviders() {
@@ -743,4 +748,21 @@ class Preview {
 		}
 		return false;
 	}
+
+	/**
+	 * @param int $fileId
+	 * @return string
+	 */
+	private function buildCachePath($fileId) {
+		$maxX = $this->getMaxX();
+		$maxY = $this->getMaxY();
+
+		$previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/';
+		$preview = $previewPath . $maxX . '-' . $maxY . '.png';
+		if ($this->keepAspect) {
+			$preview = $previewPath . $maxX . '-with-aspect.png';
+			return $preview;
+		}
+		return $preview;
+	}
 }
diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php
index 84343df260..cec5d7c017 100644
--- a/lib/private/preview/image.php
+++ b/lib/private/preview/image.php
@@ -22,15 +22,17 @@ class Image extends Provider {
 		}
 
 		$image = new \OC_Image();
-		//check if file is encrypted
+
 		if($fileInfo['encrypted'] === true) {
-			$image->loadFromData(stream_get_contents($fileview->fopen($path, 'r')));
-		}else{
-			$image->loadFromFile($fileview->getLocalFile($path));
+			$fileName = $fileview->toTmpFile($path);
+		} else {
+			$fileName = $fileview->getLocalFile($path);
 		}
+		$image->loadFromFile($fileName);
 
 		return $image->valid() ? $image : false;
 	}
+
 }
 
-\OC\Preview::registerProvider('OC\Preview\Image');
\ No newline at end of file
+\OC\Preview::registerProvider('OC\Preview\Image');
diff --git a/lib/private/preview/mp3.php b/lib/private/preview/mp3.php
index 3fc0ab0490..21f160fd50 100644
--- a/lib/private/preview/mp3.php
+++ b/lib/private/preview/mp3.php
@@ -47,4 +47,4 @@ class MP3 extends Provider {
 
 }
 
-\OC\Preview::registerProvider('OC\Preview\MP3');
\ No newline at end of file
+\OC\Preview::registerProvider('OC\Preview\MP3');
diff --git a/lib/private/preview/office-fallback.php b/lib/private/preview/office-fallback.php
deleted file mode 100644
index f184b3149d..0000000000
--- a/lib/private/preview/office-fallback.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-namespace OC\Preview;
-
-/* //There is no (good) php-only solution for converting 2003 word documents to pdfs / pngs ...
-class DOC extends Provider {
-
-	public function getMimeType() {
-		return '/application\/msword/';
-	}
-
-	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-		require_once('');
-	}
-
-}
-
-\OC\Preview::registerProvider('OC\Preview\DOC');
-*/
-
-class DOCX extends Provider {
-
-	public function getMimeType() {
-		return '/application\/vnd.openxmlformats-officedocument.wordprocessingml.document/';
-	}
-
-	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-		require_once('phpdocx/classes/TransformDoc.inc');
-
-		$tmpDoc = $fileview->toTmpFile($path);
-
-		$transformdoc = new \TransformDoc();
-		$transformdoc->setStrFile($tmpDoc);
-		$transformdoc->generatePDF($tmpDoc);
-
-		$pdf = new \imagick($tmpDoc . '[0]');
-		$pdf->setImageFormat('jpg');
-
-		unlink($tmpDoc);
-
-		$image = new \OC_Image($pdf);
-
-		return $image->valid() ? $image : false;
-	}
-
-}
-
-\OC\Preview::registerProvider('OC\Preview\DOCX');
-
-class MSOfficeExcel extends Provider {
-
-	public function getMimeType() {
-		return null;
-	}
-
-	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-		require_once('PHPExcel/Classes/PHPExcel.php');
-		require_once('PHPExcel/Classes/PHPExcel/IOFactory.php');
-
-		$absPath = $fileview->toTmpFile($path);
-		$tmpPath = \OC_Helper::tmpFile();
-
-		$rendererName = \PHPExcel_Settings::PDF_RENDERER_DOMPDF;
-		$rendererLibraryPath = \OC::$THIRDPARTYROOT . '/3rdparty/dompdf';
-
-		\PHPExcel_Settings::setPdfRenderer($rendererName, $rendererLibraryPath);
-
-		$phpexcel = new \PHPExcel($absPath);
-		$excel = \PHPExcel_IOFactory::createWriter($phpexcel, 'PDF');
-		$excel->save($tmpPath);
-
-		$pdf = new \imagick($tmpPath . '[0]');
-		$pdf->setImageFormat('jpg');
-
-		unlink($absPath);
-		unlink($tmpPath);
-
-		$image = new \OC_Image();
-		$image->loadFromData($pdf);
-
-		return $image->valid() ? $image : false;
-	}
-
-}
-
-class XLS extends MSOfficeExcel {
-
-	public function getMimeType() {
-		return '/application\/vnd.ms-excel/';
-	}
-
-}
-
-\OC\Preview::registerProvider('OC\Preview\XLS');
-
-class XLSX extends MSOfficeExcel {
-
-	public function getMimeType() {
-		return '/application\/vnd.openxmlformats-officedocument.spreadsheetml.sheet/';
-	}
-
-}
-
-\OC\Preview::registerProvider('OC\Preview\XLSX');
-
-/* //There is no (good) php-only solution for converting powerpoint documents to pdfs / pngs ...
-class MSOfficePowerPoint extends Provider {
-
-	public function getMimeType() {
-		return null;
-	}
-
-	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-		return false;
-	}
-
-}
-
-class PPT extends MSOfficePowerPoint {
-
-	public function getMimeType() {
-		return '/application\/vnd.ms-powerpoint/';
-	}
-
-}
-
-\OC\Preview::registerProvider('OC\Preview\PPT');
-
-class PPTX extends MSOfficePowerPoint {
-
-	public function getMimeType() {
-		return '/application\/vnd.openxmlformats-officedocument.presentationml.presentation/';
-	}
-
-}
-
-\OC\Preview::registerProvider('OC\Preview\PPTX');
-*/
\ No newline at end of file
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php
index 882c4426e6..16e395cb1a 100644
--- a/lib/private/preview/office.php
+++ b/lib/private/preview/office.php
@@ -22,13 +22,7 @@ if (extension_loaded('imagick')) {
 			//let's see if there is libreoffice or openoffice on this machine
 			if($isShellExecEnabled && ($isLibreOfficeAvailable || $isOpenOfficeAvailable || is_string(\OC_Config::getValue('preview_libreoffice_path', null)))) {
 				require_once('office-cl.php');
-			}else{
-				//in case there isn't, use our fallback
-				require_once('office-fallback.php');
 			}
-		} else {
-			//in case there isn't, use our fallback
-			require_once('office-fallback.php');
 		}
 	}
 }
diff --git a/lib/private/preview/pdf.php b/lib/private/preview/pdf.php
index 064a5a3b3d..4b88b1a31e 100644
--- a/lib/private/preview/pdf.php
+++ b/lib/private/preview/pdf.php
@@ -40,6 +40,7 @@ if (extension_loaded('imagick')) {
 				//check if image object is valid
 				return $image->valid() ? $image : false;
 			}
+
 		}
 
 		\OC\Preview::registerProvider('OC\Preview\PDF');
diff --git a/lib/private/preview/provider.php b/lib/private/preview/provider.php
index 88337d64e4..f769823f6e 100644
--- a/lib/private/preview/provider.php
+++ b/lib/private/preview/provider.php
@@ -22,4 +22,5 @@ abstract class Provider {
 	 *		OC_Image object of the preview
 	 */
 	abstract public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview);
+
 }
diff --git a/lib/private/preview/svg.php b/lib/private/preview/svg.php
index 505122fddb..82ef3cdebf 100644
--- a/lib/private/preview/svg.php
+++ b/lib/private/preview/svg.php
@@ -45,8 +45,9 @@ if (extension_loaded('imagick')) {
 				//check if image object is valid
 				return $image->valid() ? $image : false;
 			}
+
 		}
 
 		\OC\Preview::registerProvider('OC\Preview\SVG');
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/private/previewmanager.php b/lib/private/previewmanager.php
index ac9a866a75..23dbee13c7 100755
--- a/lib/private/previewmanager.php
+++ b/lib/private/previewmanager.php
@@ -13,7 +13,7 @@ use OCP\IPreview;
 
 class PreviewManager implements IPreview {
 	/**
-	 * @brief return a preview of a file
+	 * return a preview of a file
 	 * @param string $file The path to the file where you want a thumbnail from
 	 * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
 	 * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
@@ -27,7 +27,7 @@ class PreviewManager implements IPreview {
 	}
 
 	/**
-	 * @brief returns true if the passed mime type is supported
+	 * returns true if the passed mime type is supported
 	 * @param string $mimeType
 	 * @return boolean
 	 */
diff --git a/lib/private/request.php b/lib/private/request.php
index 90f7488eea..09928021a7 100755
--- a/lib/private/request.php
+++ b/lib/private/request.php
@@ -16,9 +16,9 @@ class OC_Request {
 	const REGEX_LOCALHOST = '/^(127\.0\.0\.1|localhost)(:[0-9]+|)$/';
 
 	/**
-	 * @brief Check overwrite condition
+	 * Check overwrite condition
 	 * @param string $type
-	 * @returns bool
+	 * @return bool
 	 */
 	private static function isOverwriteCondition($type = '') {
 		$regex = '/' . OC_Config::getValue('overwritecondaddr', '')  . '/';
@@ -27,7 +27,7 @@ class OC_Request {
 	}
 
 	/**
-	 * @brief Checks whether a domain is considered as trusted from the list
+	 * Checks whether a domain is considered as trusted from the list
 	 * of trusted domains. If no trusted domains have been configured, returns
 	 * true.
 	 * This is used to prevent Host Header Poisoning.
@@ -47,9 +47,9 @@ class OC_Request {
 	}
 
 	/**
-	 * @brief Returns the unverified server host from the headers without checking
+	 * Returns the unverified server host from the headers without checking
 	 * whether it is a trusted domain
-	 * @returns string the server host
+	 * @return string the server host
 	 *
 	 * Returns the server host, even if the website uses one or more
 	 * reverse proxies
@@ -87,9 +87,9 @@ class OC_Request {
 	}
 
 	/**
-	 * @brief Returns the server host from the headers, or the first configured
+	 * Returns the server host from the headers, or the first configured
 	 * trusted domain if the host isn't in the trusted list
-	 * @returns string the server host
+	 * @return string the server host
 	 *
 	 * Returns the server host, even if the website uses one or more
 	 * reverse proxies
@@ -120,8 +120,8 @@ class OC_Request {
 	}
 
 	/**
-	* @brief Returns the server protocol
-	* @returns string the server protocol
+	* Returns the server protocol
+	* @return string the server protocol
 	*
 	* Returns the server protocol. It respects reverse proxy servers and load balancers
 	*/
@@ -142,8 +142,8 @@ class OC_Request {
 	}
 
 	/**
-	 * @brief Returns the request uri
-	 * @returns string the request uri
+	 * Returns the request uri
+	 * @return string the request uri
 	 *
 	 * Returns the request uri, even if the website uses one or more
 	 * reverse proxies
@@ -158,7 +158,7 @@ class OC_Request {
 	}
 
 	/**
-	 * @brief Returns the script name
+	 * Returns the script name
 	 * @return string the script name
 	 *
 	 * Returns the script name, even if the website uses one or more
@@ -176,7 +176,7 @@ class OC_Request {
 	}
 
 	/**
-	 * @brief get Path info from request
+	 * get Path info from request
 	 * @return string Path info or false when not found
 	 */
 	public static function getPathInfo() {
@@ -200,7 +200,7 @@ class OC_Request {
 	}
 
 	/**
-	 * @brief get Path info from request, not urldecoded
+	 * get Path info from request, not urldecoded
 	 * @throws Exception
 	 * @return string Path info or false when not found
 	 */
@@ -242,7 +242,7 @@ class OC_Request {
 	}
 
 	/**
-	 * @brief Check if the requester sent along an mtime
+	 * Check if the requester sent along an mtime
 	 * @return false or an mtime
 	 */
 	static public function hasModificationTime () {
diff --git a/lib/private/response.php b/lib/private/response.php
index 1aa5e629b8..e8064c8588 100644
--- a/lib/private/response.php
+++ b/lib/private/response.php
@@ -15,7 +15,7 @@ class OC_Response {
 	const STATUS_SERVICE_UNAVAILABLE = 503;
 
 	/**
-	* @brief Enable response caching by sending correct HTTP headers
+	* Enable response caching by sending correct HTTP headers
 	* @param integer $cache_time time to cache the response
 	*  >0		cache time in seconds
 	*  0 and <0	enable default browser caching
@@ -41,7 +41,7 @@ class OC_Response {
 	}
 
 	/**
-	* @brief disable browser caching
+	* disable browser caching
 	* @see enableCaching with cache_time = 0
 	*/
 	static public function disableCaching() {
@@ -49,7 +49,7 @@ class OC_Response {
 	}
 
 	/**
-	* @brief Set response status
+	* Set response status
 	* @param int $status a HTTP status code, see also the STATUS constants
 	*/
 	static public function setStatus($status) {
@@ -83,7 +83,7 @@ class OC_Response {
 	}
 
 	/**
-	* @brief Send redirect response
+	* Send redirect response
 	* @param string $location to redirect to
 	*/
 	static public function redirect($location) {
@@ -92,8 +92,8 @@ class OC_Response {
 	}
 
 	/**
-	* @brief Set reponse expire time
-	* @param $expires date-time when the response expires
+	* Set reponse expire time
+	* @param string|DateTime $expires date-time when the response expires
 	*  string for DateInterval from now
 	*  DateTime object when to expire response
 	*/
@@ -113,7 +113,7 @@ class OC_Response {
 	/**
 	* Checks and set ETag header, when the request matches sends a
 	* 'not modified' response
-	* @param $etag token to use for modification check
+	* @param string $etag token to use for modification check
 	*/
 	static public function setETagHeader($etag) {
 		if (empty($etag)) {
@@ -131,7 +131,7 @@ class OC_Response {
 	/**
 	* Checks and set Last-Modified header, when the request matches sends a
 	* 'not modified' response
-	* @param $lastModified time when the reponse was last modified
+	* @param int|DateTime|string $lastModified time when the reponse was last modified
 	*/
 	static public function setLastModifiedHeader($lastModified) {
 		if (empty($lastModified)) {
@@ -170,7 +170,7 @@ class OC_Response {
 	}
 
 	/**
-	* @brief Send file as response, checking and setting caching headers
+	* Send file as response, checking and setting caching headers
 	* @param string $filepath of file to send
 	*/
 	static public function sendFile($filepath) {
@@ -186,4 +186,36 @@ class OC_Response {
 			self::setStatus(self::STATUS_NOT_FOUND);
 		}
 	}
+
+	/*
+	 * This function adds some security related headers to all requests served via base.php
+	 * The implementation of this function has to happen here to ensure that all third-party
+	 * components (e.g. SabreDAV) also benefit from this headers.
+	 */
+	public static function addSecurityHeaders() {
+		header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters
+		header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE
+
+		// iFrame Restriction Policy
+		$xFramePolicy = OC_Config::getValue('xframe_restriction', true);
+		if ($xFramePolicy) {
+			header('X-Frame-Options: Sameorigin'); // Disallow iFraming from other domains
+		}
+
+		// Content Security Policy
+		// If you change the standard policy, please also change it in config.sample.php
+		$policy = OC_Config::getValue('custom_csp_policy',
+			'default-src \'self\'; '
+			. 'script-src \'self\' \'unsafe-eval\'; '
+			. 'style-src \'self\' \'unsafe-inline\'; '
+			. 'frame-src *; '
+			. 'img-src *; '
+			. 'font-src \'self\' data:; '
+			. 'media-src *');
+		header('Content-Security-Policy:' . $policy);
+
+		// https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
+		header('X-Robots-Tag: none');
+	}
+
 }
diff --git a/lib/private/route/cachingrouter.php b/lib/private/route/cachingrouter.php
index 6412ceb041..7a21c52343 100644
--- a/lib/private/route/cachingrouter.php
+++ b/lib/private/route/cachingrouter.php
@@ -31,7 +31,7 @@ class CachingRouter extends Router {
 	 * @return string
 	 */
 	public function generate($name, $parameters = array(), $absolute = false) {
-		sort($parameters);
+		asort($parameters);
 		$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . json_encode($parameters) . intval($absolute);
 		if ($this->cache->hasKey($key)) {
 			return $this->cache->get($key);
diff --git a/lib/private/route/route.php b/lib/private/route/route.php
index df80facf9c..87030ad785 100644
--- a/lib/private/route/route.php
+++ b/lib/private/route/route.php
@@ -124,7 +124,7 @@ class Route extends SymfonyRoute implements IRoute {
 	/**
 	 * The action to execute when this route matches, includes a file like
 	 * it is called directly
-	 * @param $file
+	 * @param string $file
 	 * @return void
 	 */
 	public function actionInclude($file) {
diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index f7900362be..a72ac2bb3f 100644
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -90,7 +90,7 @@ class Router implements IRouter {
 			$files[] = 'settings/routes.php';
 			$files[] = 'core/routes.php';
 			$files[] = 'ocs/routes.php';
-			$this->cacheKey = \OC_Cache::generateCacheKeyFromFiles($files);
+			$this->cacheKey = \OC\Cache::generateCacheKeyFromFiles($files);
 		}
 		return $this->cacheKey;
 	}
@@ -239,7 +239,7 @@ class Router implements IRouter {
 
 	/**
 	 * To isolate the variable scope used inside the $file it is required in it's own method
-	 * @param $file
+	 * @param string $file
 	 */
 	private function requireRouteFile($file) {
 		require_once $file;
diff --git a/lib/private/server.php b/lib/private/server.php
index 5d90a0b19f..47bdee4b0f 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -3,6 +3,7 @@
 namespace OC;
 
 use OC\AppFramework\Http\Request;
+use OC\AppFramework\Db\Db;
 use OC\AppFramework\Utility\SimpleContainer;
 use OC\Cache\UserCache;
 use OC\DB\ConnectionWrapper;
@@ -30,9 +31,9 @@ class Server extends SimpleContainer implements IServerContainer {
 			}
 
 			if (\OC::$session->exists('requesttoken')) {
-				$requesttoken = \OC::$session->get('requesttoken');
+				$requestToken = \OC::$session->get('requesttoken');
 			} else {
-				$requesttoken = false;
+				$requestToken = false;
 			}
 
 			if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
@@ -54,7 +55,7 @@ class Server extends SimpleContainer implements IServerContainer {
 						? $_SERVER['REQUEST_METHOD']
 						: null,
 					'urlParams' => $urlParams,
-					'requesttoken' => $requesttoken,
+					'requesttoken' => $requestToken,
 				), $stream
 			);
 		});
@@ -158,6 +159,14 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('AvatarManager', function($c) {
 			return new AvatarManager();
 		});
+		$this->registerService('Logger', function($c) {
+			/** @var $c SimpleContainer */
+			$logClass = $c->query('AllConfig')->getSystemValue('log_type', 'owncloud');
+			$logger = 'OC_Log_' . ucfirst($logClass);
+			call_user_func(array($logger, 'init'));
+
+			return new Log($logger);
+		});
 		$this->registerService('JobList', function ($c) {
 			/**
 			 * @var Server $c
@@ -177,6 +186,9 @@ class Server extends SimpleContainer implements IServerContainer {
 			}
 			return $router;
 		});
+		$this->registerService('Db', function($c){
+			return new Db();
+		});
 	}
 
 	/**
@@ -240,15 +252,23 @@ class Server extends SimpleContainer implements IServerContainer {
 	 * @return \OCP\Files\Folder
 	 */
 	function getUserFolder() {
-
-		$dir = '/files';
+		$dir = '/' . \OCP\User::getUser();
 		$root = $this->getRootFolder();
 		$folder = null;
+
 		if(!$root->nodeExists($dir)) {
 			$folder = $root->newFolder($dir);
 		} else {
 			$folder = $root->get($dir);
 		}
+
+		$dir = '/files';
+		if(!$folder->nodeExists($dir)) {
+			$folder = $folder->newFolder($dir);
+		} else {
+			$folder = $folder->get($dir);
+		}
+
 		return $folder;
 	}
 
@@ -317,14 +337,14 @@ class Server extends SimpleContainer implements IServerContainer {
 	}
 
 	/**
-	 * @return \OC\URLGenerator
+	 * @return \OCP\IURLGenerator
 	 */
 	function getURLGenerator() {
 		return $this->query('URLGenerator');
 	}
 
 	/**
-	 * @return \OC\Helper
+	 * @return \OCP\IHelper
 	 */
 	function getHelper() {
 		return $this->query('AppHelper');
@@ -384,6 +404,15 @@ class Server extends SimpleContainer implements IServerContainer {
 		return $this->query('JobList');
 	}
 
+	/**
+	 * Returns a logger instance
+	 *
+	 * @return \OCP\ILogger
+	 */
+	function getLogger() {
+		return $this->query('Logger');
+	}
+
 	/**
 	 * Returns a router for generating and matching urls
 	 *
@@ -392,4 +421,13 @@ class Server extends SimpleContainer implements IServerContainer {
 	function getRouter(){
 		return $this->query('Router');
 	}
+
+
+	/**
+	 * Returns an instance of the db facade
+	 * @return \OCP\IDb
+	 */
+	function getDb() {
+		return $this->query('Db');
+	}
 }
diff --git a/lib/private/setup.php b/lib/private/setup.php
index b1061b3a25..7a08816c4b 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -110,9 +110,10 @@ class OC_Setup {
 			// 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
+			// Update htaccess files for apache hosts
 			if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
-				self::createHtaccess();
+				self::updateHtaccess();
+				self::protectDataDirectory();
 			}
 
 			//and we are done
@@ -123,52 +124,13 @@ class OC_Setup {
 	}
 
 	/**
-	 * create .htaccess files for apache hosts
+	 * Append the correct ErrorDocument path for Apache hosts
 	 */
-	private static function createHtaccess() {
-		$content = "<IfModule mod_fcgid.c>\n";
-		$content.= "<IfModule mod_setenvif.c>\n";
-		$content.= "<IfModule mod_headers.c>\n";
-		$content.= "SetEnvIfNoCase ^Authorization$ \"(.+)\" XAUTHORIZATION=$1\n";
-		$content.= "RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION\n";
-		$content.= "</IfModule>\n";
-		$content.= "</IfModule>\n";
-		$content.= "</IfModule>\n";
+	public static function updateHtaccess() {
+		$content = "\n";
 		$content.= "ErrorDocument 403 ".OC::$WEBROOT."/core/templates/403.php\n";//custom 403 error page
-		$content.= "ErrorDocument 404 ".OC::$WEBROOT."/core/templates/404.php\n";//custom 404 error page
-		$content.= "<IfModule mod_php5.c>\n";
-		$content.= "php_value upload_max_filesize 512M\n";//upload limit
-		$content.= "php_value post_max_size 512M\n";
-		$content.= "php_value memory_limit 512M\n";
-		$content.= "php_value mbstring.func_overload 0\n";
-		$content.= "<IfModule env_module>\n";
-		$content.= "  SetEnv htaccessWorking true\n";
-		$content.= "</IfModule>\n";
-		$content.= "</IfModule>\n";
-		$content.= "<IfModule mod_rewrite.c>\n";
-		$content.= "RewriteEngine on\n";
-		$content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]\n";
-		$content.= "RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L]\n";
-		$content.= "RewriteRule ^.well-known/carddav /remote.php/carddav/ [R]\n";
-		$content.= "RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]\n";
-		$content.= "RewriteRule ^apps/([^/]*)/(.*\.(php))$ index.php?app=$1&getfile=$2 [QSA,L]\n";
-		$content.= "RewriteRule ^remote/(.*) remote.php [QSA,L]\n";
-		$content.= "</IfModule>\n";
-		$content.= "<IfModule mod_mime.c>\n";
-		$content.= "AddType image/svg+xml svg svgz\n";
-		$content.= "AddEncoding gzip svgz\n";
-		$content.= "</IfModule>\n";
-		$content.= "<IfModule dir_module>\n";
-		$content.= "DirectoryIndex index.php index.html\n";
-		$content.= "</IfModule>\n";
-		$content.= "AddDefaultCharset utf-8\n";
-		$content.= "Options -Indexes\n";
-		$content.= "<IfModule pagespeed_module>\n";
-		$content.= "ModPagespeed Off\n";
-		$content.= "</IfModule>\n";
-		@file_put_contents(OC::$SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it
-
-		self::protectDataDirectory();
+		$content.= "ErrorDocument 404 ".OC::$WEBROOT."/core/templates/404.php";//custom 404 error page
+		@file_put_contents(OC::$SERVERROOT.'/.htaccess', $content, FILE_APPEND); //suppress errors in case we don't have permissions for it
 	}
 
 	public static function protectDataDirectory() {
@@ -190,7 +152,7 @@ class OC_Setup {
 	}
 
 	/**
-	 * @brief Post installation checks
+	 * Post installation checks
 	 */
 	public static function postSetupCheck($params) {
 		// setup was successful -> webdav testing now
diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php
index 515ec85909..ab9e0ca492 100644
--- a/lib/private/share/helper.php
+++ b/lib/private/share/helper.php
@@ -25,13 +25,14 @@ 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)
+	 * @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 string $uidOwner User that is the owner of shared item
+	 * @param string $suggestedTarget The suggested target originating from a reshare (optional)
+	 * @param int $groupParent The id of the parent group share (optional)
+	 * @throws \Exception
 	 * @return string Item target
 	 */
 	public static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
@@ -142,9 +143,9 @@ class Helper extends \OC\Share\Constants {
 
 	/**
 	 * 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)
+	 * @param int $parent Id of item to delete
+	 * @param bool $excludeParent If true, exclude the parent from the delete (optional)
+	 * @param string $uidOwner The user that the parent was shared with (optional)
 	 */
 	public static function delete($parent, $excludeParent = false, $uidOwner = null) {
 		$ids = array($parent);
@@ -201,7 +202,7 @@ class Helper extends \OC\Share\Constants {
 	}
 
 	/**
-	 * @brief get default expire settings defined by the admin
+	 * get default expire settings defined by the admin
 	 * @return array contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
 	 */
 	public static function getDefaultExpireSetting() {
@@ -221,7 +222,7 @@ class Helper extends \OC\Share\Constants {
 	}
 
 	/**
-	 * @brief calculate expire date
+	 * calculate expire date
 	 * @param array $defaultExpireSettings contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
 	 * @param int $creationTime timestamp when the share was created
 	 * @param int $userExpireDate expire timestamp set by the user
@@ -231,7 +232,7 @@ class Helper extends \OC\Share\Constants {
 
 		$expires = false;
 
-		if (isset($defaultExpireSettings['defaultExpireDateSet']) && $defaultExpireSettings['defaultExpireDateSet']) {
+		if (!empty($defaultExpireSettings['defaultExpireDateSet'])) {
 			$expires = $creationTime + $defaultExpireSettings['expireAfterDays'] * 86400;
 		}
 
@@ -239,8 +240,8 @@ class Helper extends \OC\Share\Constants {
 		if (isset($userExpireDate)) {
 			// if the admin decided to enforce the default expire date then we only take
 			// the user defined expire date of it is before the default expire date
-			if ($expires && isset($defaultExpireSettings['enforceExpireDate']) && $defaultExpireSettings['enforceExpireDate']) {
-				$expires = ($userExpireDate < $expires) ? $userExpireDate : $expires;
+			if ($expires && !empty($defaultExpireSettings['enforceExpireDate'])) {
+				$expires = min($userExpireDate, $expires);
 			} else {
 				$expires = $userExpireDate;
 			}
diff --git a/lib/private/share/hooks.php b/lib/private/share/hooks.php
index a33c71eedd..9ac64d888e 100644
--- a/lib/private/share/hooks.php
+++ b/lib/private/share/hooks.php
@@ -22,9 +22,9 @@
 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
+	 * @param array $arguments
 	 */
 	public static function post_deleteUser($arguments) {
 		// Delete any items shared with the deleted user
@@ -42,7 +42,7 @@ class Hooks extends \OC\Share\Constants {
 	/**
 	 * Function that is called after a user is added to a group.
 	 * TODO what does it do?
-	 * @param array arguments
+	 * @param array $arguments
 	 */
 	public static function post_addToGroup($arguments) {
 		// Find the group shares and check if the user needs a unique target
@@ -76,7 +76,7 @@ class Hooks extends \OC\Share\Constants {
 
 	/**
 	 * Function that is called after a user is removed from a group. Shares are cleaned up.
-	 * @param array arguments
+	 * @param array $arguments
 	 */
 	public static function post_removeFromGroup($arguments) {
 		$sql = 'SELECT `id`, `share_type` FROM `*PREFIX*share`'
@@ -95,7 +95,7 @@ class Hooks extends \OC\Share\Constants {
 
 	/**
 	 * Function that is called after a group is removed. Cleans up the shares to that group.
-	 * @param array arguments
+	 * @param array $arguments
 	 */
 	public static function post_deleteGroup($arguments) {
 		$sql = 'SELECT `id` FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?';
diff --git a/lib/private/share/mailnotifications.php b/lib/private/share/mailnotifications.php
index 4799db5233..cb74dcf8b9 100644
--- a/lib/private/share/mailnotifications.php
+++ b/lib/private/share/mailnotifications.php
@@ -21,11 +21,30 @@
 
 namespace OC\Share;
 
+use DateTime;
+
 class MailNotifications {
 
-	private $senderId;    // sender userId
-	private $from;        // sender email address
+	/**
+	 * sender userId
+	 * @var null|string
+	 */
+	private $senderId;
+
+	/**
+	 * sender email address
+	 * @var string
+	 */
+	private $from;
+
+	/**
+	 * @var string
+	 */
 	private $senderDisplayName;
+
+	/**
+	 * @var \OC_L10N
+	 */
 	private $l;
 
 	/**
@@ -47,11 +66,11 @@ class MailNotifications {
 	}
 
 	/**
-	 * @brief inform users if a file was shared with them
+	 * inform users if a file was shared with them
 	 *
 	 * @param array $recipientList list of recipients
-	 * @param type $itemSource shared item source
-	 * @param type $itemType shared item type
+	 * @param string $itemSource shared item source
+	 * @param string $itemType shared item type
 	 * @return array list of user to whom the mail send operation failed
 	 */
 	public function sendInternalShareMail($recipientList, $itemSource, $itemType) {
@@ -106,7 +125,7 @@ class MailNotifications {
 	}
 
 	/**
-	 * @brief inform recipient about public link share
+	 * inform recipient about public link share
 	 *
 	 * @param string $recipient recipient email address
 	 * @param string $filename the shared file
@@ -131,12 +150,12 @@ class MailNotifications {
 	}
 
 	/**
-	 * @brief create mail body for plain text and html mail
+	 * create mail body for plain text and html mail
 	 *
 	 * @param string $filename the shared file
 	 * @param string $link link to the shared file
 	 * @param int $expiration expiration date (timestamp)
-	 * @return array with the html mail body and the plain text mail body
+	 * @return array an array of the html mail body and the plain text mail body
 	 */
 	private function createMailBody($filename, $link, $expiration) {
 
diff --git a/lib/private/share/searchresultsorter.php b/lib/private/share/searchresultsorter.php
index 76abbf3084..91709902ff 100644
--- a/lib/private/share/searchresultsorter.php
+++ b/lib/private/share/searchresultsorter.php
@@ -18,8 +18,8 @@ class SearchResultSorter {
 	 * @param string $search the search term as was given by the user
 	 * @param string $key the array key containing the value that should be compared
 	 * against
-	 * @param $encoding optional, encoding to use, defaults to UTF-8
-	 * @param $log optional, an \OC\Log instance
+	 * @param string $encoding optional, encoding to use, defaults to UTF-8
+	 * @param \OC\Log $log optional
 	 */
 	public function __construct($search, $key, \OC\Log $log = null, $encoding = 'UTF-8') {
 		$this->encoding = $encoding;
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index c0ce3a1d8a..16bc492d38 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -48,11 +48,11 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType Item type
+	 * @param string $class Backend class
+	 * @param string $collectionOf (optional) Depends on item type
+	 * @param array $supportedFileExtensions (optional) List of supported file extensions if this item type depends on files
+	 * @return boolean true if backend is registered or false if error
 	 */
 	public static function registerBackend($itemType, $class, $collectionOf = null, $supportedFileExtensions = null) {
 		if (self::isEnabled()) {
@@ -78,7 +78,7 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * Check if the Share API is enabled
-	 * @return Returns true if enabled or false
+	 * @return boolean true if enabled or false
 	 *
 	 * The Share API is enabled by default if not configured
 	 */
@@ -93,8 +93,8 @@ class Share extends \OC\Share\Constants {
 	 * Find which users can access a shared item
 	 * @param string $path to the file
 	 * @param string $ownerUser owner of the file
-	 * @param bool $includeOwner include owner to the list of users with access to the file
-	 * @param bool $returnUserPaths Return an array with the user => path map
+	 * @param boolean $includeOwner include owner to the list of users with access to the file
+	 * @param boolean $returnUserPaths Return an array with the user => path map
 	 * @return array
 	 * @note $path needs to be relative to user data dir, e.g. 'file.txt'
 	 *       not '/admin/data/file.txt'
@@ -239,12 +239,12 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType
+	 * @param int $format (optional) Format type must be defined by the backend
+	 * @param mixed $parameters (optional)
+	 * @param int $limit Number of items to return (optional) Returns all by default
+	 * @param boolean $includeCollections (optional)
+	 * @return mixed Return depends on format
 	 */
 	public static function getItemsSharedWith($itemType, $format = self::FORMAT_NONE,
 		$parameters = null, $limit = -1, $includeCollections = false) {
@@ -254,13 +254,13 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * Get the items of item type shared with a user
-	 * @param string Item type
-	 * @param sting user id for which user we want the shares
-	 * @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
+	 * @param string $itemType
+	 * @param string $user id for which user we want the shares
+	 * @param int $format (optional) Format type must be defined by the backend
+	 * @param mixed $parameters (optional)
+	 * @param int $limit Number of items to return (optional) Returns all by default
+	 * @param boolean $includeCollections (optional)
+	 * @return mixed Return depends on format
 	 */
 	public static function getItemsSharedWithUser($itemType, $user, $format = self::FORMAT_NONE,
 		$parameters = null, $limit = -1, $includeCollections = false) {
@@ -273,9 +273,9 @@ class Share extends \OC\Share\Constants {
 	 * @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
+	 * @param mixed $parameters (optional)
+	 * @param boolean $includeCollections (optional)
+	 * @return mixed Return depends on format
 	 */
 	public static function getItemSharedWith($itemType, $itemTarget, $format = self::FORMAT_NONE,
 		$parameters = null, $includeCollections = false) {
@@ -334,12 +334,12 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @param int $format (optional) Format type must be defined by the backend
+	 * @param mixed $parameters
+	 * @param boolean $includeCollections
+	 * @return mixed Return depends on format
 	 */
 	public static function getItemSharedWithBySource($itemType, $itemSource, $format = self::FORMAT_NONE,
 		$parameters = null, $includeCollections = false) {
@@ -349,10 +349,10 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @param string $uidOwner Owner of link
+	 * @return array
 	 */
 	public static function getItemSharedWithByLink($itemType, $itemSource, $uidOwner) {
 		return self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null, $uidOwner, self::FORMAT_NONE,
@@ -362,7 +362,7 @@ class Share extends \OC\Share\Constants {
 	/**
 	 * 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
+	 * @return array|boolean 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);
@@ -388,8 +388,8 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * resolves reshares down to the last real share
-	 * @param $linkItem
-	 * @return $fileOwner
+	 * @param array $linkItem
+	 * @return array file owner
 	 */
 	public static function resolveReShare($linkItem)
 	{
@@ -411,12 +411,12 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType
+	 * @param int $format (optional) Format type must be defined by the backend
+	 * @param mixed $parameters
+	 * @param int $limit Number of items to return (optional) Returns all by default
+	 * @param boolean $includeCollections
+	 * @return mixed Return depends on format
 	 */
 	public static function getItemsShared($itemType, $format = self::FORMAT_NONE, $parameters = null,
 		$limit = -1, $includeCollections = false) {
@@ -426,12 +426,12 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @param int $format (optional) Format type must be defined by the backend
+	 * @param mixed $parameters
+	 * @param boolean $includeCollections
+	 * @return mixed Return depends on format
 	 */
 	public static function getItemShared($itemType, $itemSource, $format = self::FORMAT_NONE,
 	                                     $parameters = null, $includeCollections = false) {
@@ -441,12 +441,12 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @param string $uidOwner
+	 * @param boolean $includeCollections
+	 * @param boolean $checkExpireDate
+	 * @return array Return array of users
 	 */
 	public static function getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections = false, $checkExpireDate = true) {
 
@@ -471,16 +471,12 @@ class Share extends \OC\Share\Constants {
 	 * @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
+	 * @param string $itemSourceName
+	 * @param \DateTime $expirationDate
+	 * @return boolean|string Returns true on success or false on failure, Returns token on success for links
 	 * @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) {
+	public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName = null, \DateTime $expirationDate = null) {
 		$uidOwner = \OC_User::getUser();
 		$sharingPolicy = \OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global');
 		$l = \OC_L10N::get('lib');
@@ -489,7 +485,6 @@ class Share extends \OC\Share\Constants {
 			$itemSourceName = $itemSource;
 		}
 
-
 		// verify that the file exists before we try to share it
 		if ($itemType === 'file' or $itemType === 'folder') {
 			$path = \OC\Files\Filesystem::getPath($itemSource);
@@ -588,7 +583,9 @@ class Share extends \OC\Share\Constants {
 			$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
+				// FIXME Don't delete link if we update it
 				if ($checkExists = self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null,
 					$uidOwner, self::FORMAT_NONE, null, 1)) {
 					// remember old token
@@ -599,7 +596,7 @@ class Share extends \OC\Share\Constants {
 				}
 
 				// Generate hash of password - same method as user passwords
-				if (isset($shareWith)) {
+				if (!empty($shareWith)) {
 					$forcePortable = (CRYPT_BLOWFISH != 1);
 					$hasher = new \PasswordHash(8, $forcePortable);
 					$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
@@ -611,6 +608,13 @@ class Share extends \OC\Share\Constants {
 					}
 				}
 
+				if (\OCP\Util::isPublicLinkPasswordRequired() && empty($shareWith)) {
+					$message = 'You need to provide a password to create a public link, only protected links are allowed';
+					$message_t = $l->t('You need to provide a password to create a public link, only protected links are allowed');
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message_t);
+				}
+
 				// Generate token
 				if (isset($oldToken)) {
 					$token = $oldToken;
@@ -618,7 +622,7 @@ class Share extends \OC\Share\Constants {
 					$token = \OC_Util::generateRandomBytes(self::TOKEN_LENGTH);
 				}
 				$result = self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions,
-					null, $token, $itemSourceName);
+					null, $token, $itemSourceName, $expirationDate);
 				if ($result) {
 					return $token;
 				} else {
@@ -637,17 +641,18 @@ class Share extends \OC\Share\Constants {
 			\OC_Log::write('OCP\Share', sprintf($message, $shareType, $itemSource), \OC_Log::ERROR);
 			throw new \Exception($message_t);
 		}
-			// Put the item into the database
-			return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, null, $itemSourceName);
+
+		// Put the item into the database
+		return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, null, $itemSourceName, $expirationDate);
 	}
 
 	/**
 	 * 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
+	 * @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
+	 * @return boolean 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);
@@ -660,9 +665,9 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @return boolean true on success or false on failure
 	 */
 	public static function unshareAll($itemType, $itemSource) {
 		// Get all of the owners of shares of this item.
@@ -692,9 +697,9 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType
+	 * @param string $itemTarget
+	 * @return boolean true on success or false on failure
 	 *
 	 * Unsharing from self is not allowed for items inside collections
 	 */
@@ -727,12 +732,13 @@ class Share extends \OC\Share\Constants {
 		}
 		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
+	 * @param boolean $status
 	 */
 	public static function setSendMailStatus($itemType, $itemSource, $shareType, $status) {
 		$status = $status ? 1 : 0;
@@ -751,12 +757,12 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @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 permissions
+	 * @return boolean true on success or false on failure
 	 */
 	public static function setPermissions($itemType, $itemSource, $shareType, $shareWith, $permissions) {
 		$l = \OC_L10N::get('lib');
@@ -842,7 +848,7 @@ class Share extends \OC\Share\Constants {
 	 * @param string $itemType
 	 * @param string $itemSource
 	 * @param string $date expiration date
-	 * @return \OCP\Share_Backend
+	 * @return boolean
 	 */
 	public static function setExpirationDate($itemType, $itemSource, $date) {
 		$user = \OC_User::getUser();
@@ -873,20 +879,24 @@ class Share extends \OC\Share\Constants {
 	/**
 	 * 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.
+	 * @return boolean True if item was expired, false otherwise.
 	 */
 	protected static function expireItem(array $item) {
 
-		// get default expire settings
-		$defaultSettings = Helper::getDefaultExpireSetting();
 		// calculate expire date
 		if (!empty($item['expiration'])) {
 			$userDefinedExpire = new \DateTime($item['expiration']);
-			$userDefinedExpireTimestamp = $userDefinedExpire->getTimestamp();
+			$expires = $userDefinedExpire->getTimestamp();
 		} else {
-			$userDefinedExpireTimestamp = null;
+			$expires = null;
+		}
+
+		// only use default expire date for link shares
+		if((int)$item['share_type'] === self::SHARE_TYPE_LINK) {
+			// get default expire settings
+			$defaultSettings = Helper::getDefaultExpireSetting();
+			$expires = Helper::calculateExpireDate($defaultSettings, $item['stime'], $expires);
 		}
-		$expires = Helper::calculateExpireDate($defaultSettings, $item['stime'], $userDefinedExpireTimestamp);
 
 		if (is_int($expires)) {
 			$now = time();
@@ -925,6 +935,7 @@ class Share extends \OC\Share\Constants {
 	/**
 	 * Get the backend class for the specified item type
 	 * @param string $itemType
+	 * @throws \Exception
 	 * @return \OCP\Share_Backend
 	 */
 	public static function getBackend($itemType) {
@@ -957,7 +968,7 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * Check if resharing is allowed
-	 * @return Returns true if allowed or false
+	 * @return boolean true if allowed or false
 	 *
 	 * Resharing is allowed by default if not configured
 	 */
@@ -974,7 +985,7 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * Get a list of collection item types for the specified item type
-	 * @param string Item type
+	 * @param string $itemType
 	 * @return array
 	 */
 	private static function getCollectionItemTypes($itemType) {
@@ -998,17 +1009,17 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType
+	 * @param string $item Item source or target (optional)
+	 * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, SHARE_TYPE_LINK, $shareTypeUserAndGroups, or $shareTypeGroupUserUnique
+	 * @param string $shareWith User or group the item is being shared with
+	 * @param string $uidOwner User that is the owner of shared items (optional)
+	 * @param int $format Format to convert items to with formatItems() (optional)
+	 * @param mixed $parameters to pass to formatItems() (optional)
+	 * @param int $limit Number of items to return, -1 to return all matches (optional)
+	 * @param boolean $includeCollections Include collection item types (optional)
+	 * @param boolean $itemShareWithBySource (optional)
+	 * @param boolean $checkExpireDate
 	 * @return array
 	 *
 	 * See public functions getItem(s)... for parameter usage
@@ -1228,7 +1239,7 @@ class Share extends \OC\Share\Constants {
 				} else {
 					if (!isset($mounts[$row['storage']])) {
 						$mountPoints = \OC\Files\Filesystem::getMountByNumericId($row['storage']);
-						if (is_array($mountPoints)) {
+						if (is_array($mountPoints) && !empty($mountPoints)) {
 							$mounts[$row['storage']] = current($mountPoints);
 						}
 					}
@@ -1343,19 +1354,21 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @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 string $uidOwner User that is the owner of shared item
+	 * @param int $permissions CRUDS permissions
+	 * @param boolean|array $parentFolder Parent folder target (optional)
+	 * @param string $token (optional)
+	 * @param string $itemSourceName name of the source item (optional)
+	 * @param \DateTime $expirationDate (optional)
+	 * @throws \Exception
+	 * @return boolean Returns true on success or false on failure
 	 */
 	private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
-		$permissions, $parentFolder = null, $token = null, $itemSourceName = null) {
+		$permissions, $parentFolder = null, $token = null, $itemSourceName = null, \DateTime $expirationDate = null) {
 		$backend = self::getBackend($itemType);
 		$l = \OC_L10N::get('lib');
 		// Check if this is a reshare
@@ -1385,6 +1398,7 @@ class Share extends \OC\Share\Constants {
 					$suggestedItemTarget = $checkReshare['item_target'];
 					$suggestedFileTarget = $checkReshare['file_target'];
 					$filePath = $checkReshare['file_target'];
+					$expirationDate = min($expirationDate, $checkReshare['expiration']);
 				}
 			} else {
 				$message = 'Sharing %s failed, because resharing is not allowed';
@@ -1424,9 +1438,7 @@ class Share extends \OC\Share\Constants {
 				$fileSource = null;
 			}
 		}
-		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`,'
-			.' `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`,'
-			.' `file_target`, `token`, `parent`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)');
+
 		// Share with a group
 		if ($shareType == self::SHARE_TYPE_GROUP) {
 			$groupItemTarget = Helper::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'],
@@ -1442,6 +1454,7 @@ class Share extends \OC\Share\Constants {
 				'uidOwner' => $uidOwner,
 				'permissions' => $permissions,
 				'fileSource' => $fileSource,
+				'expiration' => $expirationDate,
 				'token' => $token,
 				'run' => &$run,
 				'error' => &$error
@@ -1471,8 +1484,21 @@ class Share extends \OC\Share\Constants {
 				$groupFileTarget = null;
 			}
 			$queriesToExecute = array();
-			$queriesToExecute['groupShare'] = array($itemType, $itemSource, $groupItemTarget, $shareType,
-				$shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget, $token, $parent);
+			$queriesToExecute['groupShare'] = array(
+				'itemType'			=> $itemType,
+				'itemSource'		=> $itemSource,
+				'itemTarget'		=> $groupItemTarget,
+				'shareType'			=> $shareType,
+				'shareWith'			=> $shareWith['group'],
+				'uidOwner'			=> $uidOwner,
+				'permissions'		=> $permissions,
+				'shareTime'			=> time(),
+				'fileSource'		=> $fileSource,
+				'fileTarget'		=> $groupFileTarget,
+				'token'				=> $token,
+				'parent'			=> $parent,
+				'expiration'		=> $expirationDate,
+			);
 			// 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,
@@ -1498,19 +1524,32 @@ class Share extends \OC\Share\Constants {
 				}
 				// 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)) {
-					$queriesToExecute[] = array($itemType, $itemSource, $itemTarget,
-						self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(),
-							$fileSource, $fileTarget, $token);
-					$id = \OC_DB::insertid('*PREFIX*share');
+					$queriesToExecute[] = array(
+						'itemType'			=> $itemType,
+						'itemSource'		=> $itemSource,
+						'itemTarget'		=> $itemTarget,
+						'shareType'			=> self::$shareTypeGroupUserUnique,
+						'shareWith'			=> $uid,
+						'uidOwner'			=> $uidOwner,
+						'permissions'		=> $permissions,
+						'shareTime'			=> time(),
+						'fileSource'		=> $fileSource,
+						'fileTarget'		=> $fileTarget,
+						'token'				=> $token,
+						//'parent'			=> $parent,
+						'expiration'		=> $expirationDate,
+					);
 				}
 			}
-			$query->execute($queriesToExecute['groupShare']);
+
+			self::insertShare($queriesToExecute['groupShare']);
 			// Save this id, any extra rows for this group share will need to reference it
 			$parent = \OC_DB::insertid('*PREFIX*share');
 			unset($queriesToExecute['groupShare']);
-			foreach ($queriesToExecute as $qe) {
-				$qe[] = $parent;
-				$query->execute($qe);
+
+			foreach ($queriesToExecute as $shareQuery) {
+				$shareQuery['parent'] = $parent;
+				self::insertShare($shareQuery);
 			}
 
 			\OC_Hook::emit('OCP\Share', 'post_shared', array(
@@ -1525,7 +1564,8 @@ class Share extends \OC\Share\Constants {
 				'fileSource' => $fileSource,
 				'fileTarget' => $groupFileTarget,
 				'id' => $parent,
-				'token' => $token
+				'token' => $token,
+				'expirationDate' => $expirationDate,
 			));
 
 			if ($parentFolder === true) {
@@ -1547,8 +1587,9 @@ class Share extends \OC\Share\Constants {
 				'permissions' => $permissions,
 				'fileSource' => $fileSource,
 				'token' => $token,
+				'expirationDate' => $expirationDate,
 				'run' => &$run,
-				'error' => &$error
+				'error' => &$error,
 			));
 
 			if ($run === false) {
@@ -1572,8 +1613,23 @@ class Share extends \OC\Share\Constants {
 			} else {
 				$fileTarget = null;
 			}
-			$query->execute(array($itemType, $itemSource, $itemTarget, $shareType, $shareWith, $uidOwner,
-				$permissions, time(), $fileSource, $fileTarget, $token, $parent));
+
+			self::insertShare(array(
+				'itemType'			=> $itemType,
+				'itemSource'		=> $itemSource,
+				'itemTarget'		=> $itemTarget,
+				'shareType'			=> $shareType,
+				'shareWith'			=> $shareWith,
+				'uidOwner'			=> $uidOwner,
+				'permissions'		=> $permissions,
+				'shareTime'			=> time(),
+				'fileSource'		=> $fileSource,
+				'fileTarget'		=> $fileTarget,
+				'token'				=> $token,
+				'parent'			=> $parent,
+				'expiration'		=> $expirationDate,
+			));
+
 			$id = \OC_DB::insertid('*PREFIX*share');
 			\OC_Hook::emit('OCP\Share', 'post_shared', array(
 				'itemType' => $itemType,
@@ -1587,7 +1643,8 @@ class Share extends \OC\Share\Constants {
 				'fileSource' => $fileSource,
 				'fileTarget' => $fileTarget,
 				'id' => $id,
-				'token' => $token
+				'token' => $token,
+				'expirationDate' => $expirationDate,
 			));
 			if ($parentFolder === true) {
 				$parentFolders['id'] = $id;
@@ -1598,6 +1655,27 @@ class Share extends \OC\Share\Constants {
 		return true;
 	}
 
+	private static function insertShare(array $shareData)
+	{
+		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` ('
+			.' `item_type`, `item_source`, `item_target`, `share_type`,'
+			.' `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`,'
+			.' `file_target`, `token`, `parent`, `expiration`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)');
+		$query->bindValue(1, $shareData['itemType']);
+		$query->bindValue(2, $shareData['itemSource']);
+		$query->bindValue(3, $shareData['itemTarget']);
+		$query->bindValue(4, $shareData['shareType']);
+		$query->bindValue(5, $shareData['shareWith']);
+		$query->bindValue(6, $shareData['uidOwner']);
+		$query->bindValue(7, $shareData['permissions']);
+		$query->bindValue(8, $shareData['shareTime']);
+		$query->bindValue(9, $shareData['fileSource']);
+		$query->bindValue(10, $shareData['fileTarget']);
+		$query->bindValue(11, $shareData['token']);
+		$query->bindValue(12, $shareData['parent']);
+		$query->bindValue(13, $shareData['expiration'], 'datetime');
+		$query->execute();
+	}
 	/**
 	 * Delete all shares with type SHARE_TYPE_LINK
 	 */
@@ -1614,7 +1692,7 @@ class Share extends \OC\Share\Constants {
 	 * In case a password protected link is not yet authenticated this function will return false
 	 *
 	 * @param array $linkItem
-	 * @return bool
+	 * @return boolean
 	 */
 	public static function checkPasswordProtectedShare(array $linkItem) {
 		if (!isset($linkItem['share_with'])) {
@@ -1640,9 +1718,9 @@ class Share extends \OC\Share\Constants {
 	}
 
 	/**
-	 * @breif construct select statement
+	 * construct select statement
 	 * @param int $format
-	 * @param bool $fileDependent ist it a file/folder share or a generla share
+	 * @param boolean $fileDependent ist it a file/folder share or a generla share
 	 * @param string $uidOwner
 	 * @return string select statement
 	 */
@@ -1684,7 +1762,7 @@ class Share extends \OC\Share\Constants {
 
 
 	/**
-	 * @brief transform db results
+	 * transform db results
 	 * @param array $row result
 	 */
 	private static function transformDBResults(&$row) {
@@ -1715,13 +1793,13 @@ class Share extends \OC\Share\Constants {
 	}
 
 	/**
-	 * @brief format result
+	 * 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 string $column is it a file share or a general share ('file_target' or 'item_target')
+	 * @param \OCP\Share_Backend $backend sharing backend
 	 * @param int $format
-	 * @param array additional format parameters
-	 * @return array formate result
+	 * @param array $parameters additional format parameters
+	 * @return array format result
 	 */
 	private static function formatResult($items, $column, $backend, $format = self::FORMAT_NONE , $parameters = null) {
 		if ($format === self::FORMAT_NONE) {
diff --git a/lib/private/subadmin.php b/lib/private/subadmin.php
index 5b6072987a..f5ef00ce4f 100644
--- a/lib/private/subadmin.php
+++ b/lib/private/subadmin.php
@@ -31,7 +31,7 @@ OC_Hook::connect('OC_User', 'post_deleteGroup', 'OC_SubAdmin', 'post_deleteGroup
 class OC_SubAdmin{
 
 	/**
-	 * @brief add a SubAdmin
+	 * add a SubAdmin
 	 * @param string $uid uid of the SubAdmin
 	 * @param string $gid gid of the group
 	 * @return boolean
@@ -44,7 +44,7 @@ class OC_SubAdmin{
 	}
 
 	/**
-	 * @brief delete a SubAdmin
+	 * delete a SubAdmin
 	 * @param string $uid uid of the SubAdmin
 	 * @param string $gid gid of the group
 	 * @return boolean
@@ -57,7 +57,7 @@ class OC_SubAdmin{
 	}
 
 	/**
-	 * @brief get groups of a SubAdmin
+	 * get groups of a SubAdmin
 	 * @param string $uid uid of the SubAdmin
 	 * @return array
 	 */
@@ -72,7 +72,7 @@ class OC_SubAdmin{
 	}
 
 	/**
-	 * @brief get SubAdmins of a group
+	 * get SubAdmins of a group
 	 * @param string $gid gid of the group
 	 * @return array
 	 */
@@ -87,7 +87,7 @@ class OC_SubAdmin{
 	}
 
 	/**
-	 * @brief get all SubAdmins
+	 * get all SubAdmins
 	 * @return array
 	 */
 	public static function getAllSubAdmins() {
@@ -101,7 +101,7 @@ class OC_SubAdmin{
 	}
 
 	/**
-	 * @brief checks if a user is a SubAdmin of a group
+	 * checks if a user is a SubAdmin of a group
 	 * @param string $uid uid of the subadmin
 	 * @param string $gid gid of the group
 	 * @return bool
@@ -117,7 +117,7 @@ class OC_SubAdmin{
 	}
 
 	/**
-	 * @brief checks if a user is a SubAdmin
+	 * checks if a user is a SubAdmin
 	 * @param string $uid uid of the subadmin
 	 * @return bool
 	 */
@@ -137,7 +137,7 @@ class OC_SubAdmin{
 	}
 
 	/**
-	 * @brief checks if a user is a accessible by a subadmin
+	 * checks if a user is a accessible by a subadmin
 	 * @param string $subadmin uid of the subadmin
 	 * @param string $user uid of the user
 	 * @return bool
@@ -159,15 +159,15 @@ class OC_SubAdmin{
 	}
 
 	/*
-	 * @brief alias for self::isSubAdminofGroup()
+	 * alias for self::isSubAdminofGroup()
 	 */
 	public static function isGroupAccessible($subadmin, $group) {
 		return self::isSubAdminofGroup($subadmin, $group);
 	}
 
 	/**
-	 * @brief delete all SubAdmins by uid
-	 * @param $parameters
+	 * delete all SubAdmins by uid
+	 * @param array $parameters
 	 * @return boolean
 	 */
 	public static function post_deleteUser($parameters) {
@@ -177,8 +177,8 @@ class OC_SubAdmin{
 	}
 
 	/**
-	 * @brief delete all SubAdmins by gid
-	 * @param $parameters
+	 * delete all SubAdmins by gid
+	 * @param array $parameters
 	 * @return boolean
 	 */
 	public static function post_deleteGroup($parameters) {
diff --git a/lib/private/tags.php b/lib/private/tags.php
index 06550068f7..0b62caf2dd 100644
--- a/lib/private/tags.php
+++ b/lib/private/tags.php
@@ -121,21 +121,7 @@ class Tags implements \OCP\ITags {
 	* @return boolean.
 	*/
 	public function isEmpty() {
-		$sql = 'SELECT COUNT(*) FROM `' . self::TAG_TABLE . '` '
-			. 'WHERE `uid` = ? AND `type` = ?';
-		try {
-			$stmt = \OCP\DB::prepare($sql);
-			$result = $stmt->execute(array($this->user, $this->type));
-			if (\OCP\DB::isError($result)) {
-				\OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR);
-				return false;
-			}
-			return ((int)$result->fetchOne() === 0);
-		} catch(\Exception $e) {
-			\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
-				\OCP\Util::ERROR);
-			return false;
-		}
+		return count($this->tags) === 0;
 	}
 
 	/**
@@ -184,6 +170,10 @@ class Tags implements \OCP\ITags {
 			$tagId = $tag;
 		} elseif(is_string($tag)) {
 			$tag = trim($tag);
+			if($tag === '') {
+				\OCP\Util::writeLog('core', __METHOD__.', Cannot use empty tag names', \OCP\Util::DEBUG);
+				return false;
+			}
 			$tagId = $this->array_searchi($tag, $this->tags);
 		}
 
@@ -234,11 +224,15 @@ class Tags implements \OCP\ITags {
 	* Add a new tag.
 	*
 	* @param string $name A string with a name of the tag
-	* @return false|string the id of the added tag or false if it already exists.
+	* @return false|string the id of the added tag or false on error.
 	*/
 	public function add($name) {
 		$name = trim($name);
 
+		if($name === '') {
+			\OCP\Util::writeLog('core', __METHOD__.', Cannot add an empty tag', \OCP\Util::DEBUG);
+			return false;
+		}
 		if($this->hasTag($name)) {
 			\OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', \OCP\Util::DEBUG);
 			return false;
@@ -280,6 +274,12 @@ class Tags implements \OCP\ITags {
 	public function rename($from, $to) {
 		$from = trim($from);
 		$to = trim($to);
+
+		if($to === '' || $from === '') {
+			\OCP\Util::writeLog('core', __METHOD__.', Cannot use empty tag names', \OCP\Util::DEBUG);
+			return false;
+		}
+
 		$id = $this->array_searchi($from, $this->tags);
 		if($id === false) {
 			\OCP\Util::writeLog('core', __METHOD__.', tag: ' . $from. ' does not exist', \OCP\Util::DEBUG);
@@ -318,6 +318,8 @@ class Tags implements \OCP\ITags {
 			$names = array($names);
 		}
 		$names = array_map('trim', $names);
+		array_filter($names);
+
 		$newones = array();
 		foreach($names as $name) {
 			if(($this->in_arrayi(
@@ -391,7 +393,7 @@ class Tags implements \OCP\ITags {
 	*
 	* For hooking up on post_deleteUser
 	*
-	* @param array
+	* @param array $arguments
 	*/
 	public static function post_deleteUser($arguments) {
 		// Find all objectid/tagId pairs.
@@ -492,9 +494,9 @@ class Tags implements \OCP\ITags {
 	*/
 	public function addToFavorites($objid) {
 		if(!$this->hasTag(self::TAG_FAVORITE)) {
-			$this->add(self::TAG_FAVORITE, true);
+			$this->add(self::TAG_FAVORITE);
 		}
-		return $this->tagAs($objid, self::TAG_FAVORITE, $this->type);
+		return $this->tagAs($objid, self::TAG_FAVORITE);
 	}
 
 	/**
@@ -504,7 +506,7 @@ class Tags implements \OCP\ITags {
 	* @return boolean
 	*/
 	public function removeFromFavorites($objid) {
-		return $this->unTag($objid, self::TAG_FAVORITE, $this->type);
+		return $this->unTag($objid, self::TAG_FAVORITE);
 	}
 
 	/**
@@ -512,13 +514,17 @@ class Tags implements \OCP\ITags {
 	*
 	* @param int $objid The id of the object
 	* @param string $tag The id or name of the tag
-	* @return boolean Returns false on database error.
+	* @return boolean Returns false on error.
 	*/
 	public function tagAs($objid, $tag) {
 		if(is_string($tag) && !is_numeric($tag)) {
 			$tag = trim($tag);
+			if($tag === '') {
+				\OCP\Util::writeLog('core', __METHOD__.', Cannot add an empty tag', \OCP\Util::DEBUG);
+				return false;
+			}
 			if(!$this->hasTag($tag)) {
-				$this->add($tag, true);
+				$this->add($tag);
 			}
 			$tagId =  $this->array_searchi($tag, $this->tags);
 		} else {
@@ -549,6 +555,10 @@ class Tags implements \OCP\ITags {
 	public function unTag($objid, $tag) {
 		if(is_string($tag) && !is_numeric($tag)) {
 			$tag = trim($tag);
+			if($tag === '') {
+				\OCP\Util::writeLog('core', __METHOD__.', Tag name is empty', \OCP\Util::DEBUG);
+				return false;
+			}
 			$tagId =  $this->array_searchi($tag, $this->tags);
 		} else {
 			$tagId = $tag;
@@ -579,6 +589,7 @@ class Tags implements \OCP\ITags {
 		}
 
 		$names = array_map('trim', $names);
+		array_filter($names);
 
 		\OCP\Util::writeLog('core', __METHOD__ . ', before: '
 			. print_r($this->tags, true), \OCP\Util::DEBUG);
diff --git a/lib/private/template.php b/lib/private/template.php
index 3d18b52bac..eaa58b769d 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -30,9 +30,10 @@ class OC_Template extends \OC\Template\Base {
 	private $renderas; // Create a full page?
 	private $path; // The path to the template
 	private $headers=array(); //custom headers
+	protected $app; // app id
 
 	/**
-	 * @brief Constructor
+	 * Constructor
 	 * @param string $app app providing the template
 	 * @param string $name of the template file (without suffix)
 	 * @param string $renderas = ""; produce a full page
@@ -62,6 +63,7 @@ class OC_Template extends \OC\Template\Base {
 		// Set the private data
 		$this->renderas = $renderas;
 		$this->path = $path;
+		$this->app = $app;
 
 		parent::__construct($template, $requesttoken, $l10n, $themeDefaults);
 	}
@@ -95,7 +97,7 @@ class OC_Template extends \OC\Template\Base {
 	}
 
 	/**
-	 * @brief Returns the formfactor extension for current formfactor
+	 * Returns the formfactor extension for current formfactor
 	 */
 	static public function getFormFactorExtension()
 	{
@@ -128,7 +130,7 @@ class OC_Template extends \OC\Template\Base {
 	}
 
 	/**
-	 * @brief find the template with the given name
+	 * find the template with the given name
 	 * @param string $name of the template file (without suffix)
 	 *
 	 * Will select the template file for the selected theme and formfactor.
@@ -152,7 +154,7 @@ class OC_Template extends \OC\Template\Base {
 	}
 
 	/**
-	 * @brief Add a custom element to the header
+	 * Add a custom element to the header
 	 * @param string $tag tag name of the element
 	 * @param array $attributes array of attributes for the element
 	 * @param string $text the text content for the element
@@ -162,7 +164,7 @@ class OC_Template extends \OC\Template\Base {
 	}
 
 	/**
-	 * @brief Process the template
+	 * Process the template
 	 * @return boolean|string
 	 *
 	 * This function process the template. If $this->renderas is set, it
@@ -172,7 +174,7 @@ class OC_Template extends \OC\Template\Base {
 		$data = parent::fetchPage();
 
 		if( $this->renderas ) {
-			$page = new OC_TemplateLayout($this->renderas);
+			$page = new OC_TemplateLayout($this->renderas, $this->app);
 
 			// Add custom headers
 			$page->assign('headers', $this->headers, false);
@@ -189,7 +191,7 @@ class OC_Template extends \OC\Template\Base {
 	}
 
 	/**
-	 * @brief Include template
+	 * Include template
 	 * @return string returns content of included template
 	 *
 	 * Includes another template. use <?php echo $this->inc('template'); ?> to
@@ -200,7 +202,7 @@ class OC_Template extends \OC\Template\Base {
 	}
 
 	/**
-	 * @brief Shortcut to print a simple page for users
+	 * Shortcut to print a simple page for users
 	 * @param string $application The application we render the template for
 	 * @param string $name Name of the template
 	 * @param array $parameters Parameters for the template
@@ -215,7 +217,7 @@ class OC_Template extends \OC\Template\Base {
 	}
 
 	/**
-	 * @brief Shortcut to print a simple page for admins
+	 * Shortcut to print a simple page for admins
 	 * @param string $application The application we render the template for
 	 * @param string $name Name of the template
 	 * @param array $parameters Parameters for the template
@@ -230,7 +232,7 @@ class OC_Template extends \OC\Template\Base {
 	}
 
 	/**
-	 * @brief Shortcut to print a simple page for guests
+	 * Shortcut to print a simple page for guests
 	 * @param string $application The application we render the template for
 	 * @param string $name Name of the template
 	 * @param array|string $parameters Parameters for the template
@@ -245,7 +247,7 @@ class OC_Template extends \OC\Template\Base {
 	}
 
 	/**
-		* @brief Print a fatal error page and terminates the script
+		* Print a fatal error page and terminates the script
 		* @param string $error_msg The error message to show
 		* @param string $hint An optional hint message
 		* Warning: All data passed to $hint needs to get sanitized using OC_Util::sanitizeHTML
@@ -257,7 +259,7 @@ class OC_Template extends \OC\Template\Base {
 		$content->printPage();
 		die();
 	}
-	
+
 	/**
 	 * print error page using Exception details
 	 * @param Exception $exception
diff --git a/lib/private/template/base.php b/lib/private/template/base.php
index 3d7c685c1c..dbdfce2432 100644
--- a/lib/private/template/base.php
+++ b/lib/private/template/base.php
@@ -59,7 +59,7 @@ class Base {
 	}
 
 	/**
-	 * @brief Assign variables
+	 * Assign variables
 	 * @param string $key key
 	 * @param array|bool|integer|string $value value
 	 * @return bool
@@ -75,7 +75,7 @@ class Base {
 	}
 
 	/**
-	 * @brief Appends a variable
+	 * Appends a variable
 	 * @param string $key key
 	 * @param mixed $value value
 	 * @return boolean|null
@@ -94,7 +94,7 @@ class Base {
 	}
 
 	/**
-	 * @brief Prints the proceeded template
+	 * Prints the proceeded template
 	 * @return bool
 	 *
 	 * This function proceeds the template and prints its output.
@@ -111,7 +111,7 @@ class Base {
 	}
 
 	/**
-	 * @brief Process the template
+	 * Process the template
 	 * @return string
 	 *
 	 * This function processes the template.
@@ -121,7 +121,7 @@ class Base {
 	}
 
 	/**
-	 * @brief doing the actual work
+	 * doing the actual work
 	 * @param string $file
 	 * @return string content
 	 *
diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php
index 3c42d441ef..46e4827400 100644
--- a/lib/private/template/functions.php
+++ b/lib/private/template/functions.php
@@ -24,7 +24,7 @@ function print_unescaped($string) {
 }
 
 /**
- * @brief make OC_Helper::linkTo available as a simple function
+ * make OC_Helper::linkTo available as a simple function
  * @param string $app app
  * @param string $file file
  * @param array $args array with param=>value, will be appended to the returned url
@@ -45,7 +45,7 @@ function link_to_docs($key) {
 }
 
 /**
- * @brief make OC_Helper::imagePath available as a simple function
+ * make OC_Helper::imagePath available as a simple function
  * @param string $app app
  * @param string $image image
  * @return string link to the image
@@ -57,7 +57,7 @@ function image_path( $app, $image ) {
 }
 
 /**
- * @brief make OC_Helper::mimetypeIcon available as a simple function
+ * make OC_Helper::mimetypeIcon available as a simple function
  * @param string $mimetype mimetype
  * @return string link to the image
  *
@@ -68,10 +68,10 @@ function mimetype_icon( $mimetype ) {
 }
 
 /**
- * @brief make preview_icon available as a simple function
+ * make preview_icon available as a simple function
  * Returns the path to the preview of the image.
- * @param $path path of file
- * @returns link to the preview
+ * @param string $path path of file
+ * @return link to the preview
  *
  * For further information have a look at OC_Helper::previewIcon
  */
@@ -87,7 +87,7 @@ function publicPreview_icon ( $path, $token ) {
 }
 
 /**
- * @brief make OC_Helper::humanFileSize available as a simple function
+ * make OC_Helper::humanFileSize available as a simple function
  * @param int $bytes size in bytes
  * @return string size as string
  *
@@ -98,7 +98,7 @@ function human_file_size( $bytes ) {
 }
 
 /**
- * @brief Strips the timestamp of its time value
+ * Strips the timestamp of its time value
  * @param int $timestamp UNIX timestamp to strip
  * @return $timestamp without time value
  */
@@ -109,7 +109,7 @@ function strip_time($timestamp){
 }
 
 /**
- * @brief Formats timestamp relatively to the current time using
+ * Formats timestamp relatively to the current time using
  * a human-friendly format like "x minutes ago" or "yesterday"
  * @param int $timestamp timestamp to format
  * @param int $fromTime timestamp to compare from, defaults to current time
diff --git a/lib/private/template/resourcelocator.php b/lib/private/template/resourcelocator.php
index 8a3dd5e7fa..7976c41592 100644
--- a/lib/private/template/resourcelocator.php
+++ b/lib/private/template/resourcelocator.php
@@ -52,14 +52,10 @@ abstract class ResourceLocator {
 	}
 
 	/*
-	 * @brief append the $file resource if exist at $root
-	 * @param $root path to check
-	 * @param $file the filename
-	 * @param $web base for path, default map $root to $webroot
-	 */
-	/**
-	 * @param string $file
-	 * @param string|false $webroot
+	 * append the $file resource if exist at $root
+	 * @param string $root path to check
+	 * @param string $file the filename
+	 * @param string|null $webroot base for path, default map $root to $webroot
 	 */
 	protected function appendIfExist($root, $file, $webroot = null) {
 		if (is_file($root.'/'.$file)) {
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index b7ac02a753..a5dd9a0c61 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -15,8 +15,9 @@ class OC_TemplateLayout extends OC_Template {
 
 	/**
 	 * @param string $renderas
+	 * @param string $appid application id
 	 */
-	public function __construct( $renderas ) {
+	public function __construct( $renderas, $appid = '' ) {
 		// Decide which page we show
 
 		if( $renderas == 'user' ) {
@@ -43,6 +44,7 @@ class OC_TemplateLayout extends OC_Template {
 
 			// Add navigation entry
 			$this->assign( 'application', '', false );
+			$this->assign( 'appid', $appid );
 			$navigation = OC_App::getNavigation();
 			$this->assign( 'navigation', $navigation);
 			$this->assign( 'settingsnavigation', OC_App::getSettingsNavigation());
@@ -98,7 +100,7 @@ class OC_TemplateLayout extends OC_Template {
 	}
 
 	/**
-	 * @param $styles
+	 * @param array $styles
 	 * @return array
 	 */
 	static public function findStylesheetFiles($styles) {
@@ -116,7 +118,7 @@ class OC_TemplateLayout extends OC_Template {
 	}
 
 	/**
-	 * @param $scripts
+	 * @param array $scripts
 	 * @return array
 	 */
 	static public function findJavascriptFiles($scripts) {
@@ -175,7 +177,7 @@ class OC_TemplateLayout extends OC_Template {
 	}
 
 	/**
-	 * @param $files
+	 * @param array $files
 	 * @return string
 	 */
 	private static function hashScriptNames($files)
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 9f57aa0b6a..d8694ac6ed 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -35,7 +35,7 @@ class Updater extends BasicEmitter {
 	/**
 	 * Check if a new version is available
 	 * @param string $updaterUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php'
-	 * @return array | bool
+	 * @return array|bool
 	 */
 	public function check($updaterUrl) {
 
@@ -91,6 +91,7 @@ class Updater extends BasicEmitter {
 
 	/**
 	 * runs the update actions in maintenance mode, does not upgrade the source files
+	 * except the main .htaccess file
 	 */
 	public function upgrade() {
 		\OC_DB::enableCaching(false);
@@ -102,6 +103,11 @@ class Updater extends BasicEmitter {
 		}
 		$this->emit('\OC\Updater', 'maintenanceStart');
 
+		// Update htaccess files for apache hosts
+		if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
+			\OC_Setup::updateHtaccess();
+		}
+
 		// 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)
@@ -111,7 +117,7 @@ class Updater extends BasicEmitter {
 		 * START CONFIG CHANGES FOR OLDER VERSIONS
 		 */
 		if (!\OC::$CLI && version_compare($installedVersion, '6.90.1', '<')) {
-			// Add the overwriteHost config if it is not existant
+			// Add the trusted_domains 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 a56b0fe337..af5d977eea 100644
--- a/lib/private/urlgenerator.php
+++ b/lib/private/urlgenerator.php
@@ -29,8 +29,8 @@ class URLGenerator implements IURLGenerator {
 	}
 
 	/**
-	 * @brief Creates an url using a defined route
-	 * @param $route
+	 * Creates an url using a defined route
+	 * @param string $route
 	 * @param array $parameters
 	 * @internal param array $args with param=>value, will be appended to the returned url
 	 * @return string the url
@@ -43,7 +43,7 @@ class URLGenerator implements IURLGenerator {
 	}
 
 	/**
-	 * @brief Creates an url
+	 * Creates an url
 	 * @param string $app app
 	 * @param string $file file
 	 * @param array $args array with param=>value, will be appended to the returned url
@@ -92,7 +92,7 @@ class URLGenerator implements IURLGenerator {
 	}
 
 	/**
-	 * @brief Creates path to an image
+	 * Creates path to an image
 	 * @param string $app app
 	 * @param string $image image name
 	 * @throws \RuntimeException If the image does not exist
diff --git a/lib/private/user.php b/lib/private/user.php
index 7106d664ac..9276d7923c 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -62,7 +62,7 @@ class OC_User {
 	private static $incognitoMode = false;
 
 	/**
-	 * @brief registers backend
+	 * registers backend
 	 * @param string $backend name of the backend
 	 * @deprecated Add classes by calling useBackend with a class instance instead
 	 * @return bool
@@ -75,9 +75,9 @@ class OC_User {
 	}
 
 	/**
-	 * @brief gets available backends
+	 * gets available backends
 	 * @deprecated
-	 * @returns array of backends
+	 * @return array an array of backends
 	 *
 	 * Returns the names of all backends.
 	 */
@@ -86,9 +86,9 @@ class OC_User {
 	}
 
 	/**
-	 * @brief gets used backends
+	 * gets used backends
 	 * @deprecated
-	 * @returns array of backends
+	 * @return array an array of backends
 	 *
 	 * Returns the names of all used backends.
 	 */
@@ -97,8 +97,8 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Adds the backend to the list of used backends
-	 * @param string | OC_User_Backend $backend default: database The backend to use for user management
+	 * Adds the backend to the list of used backends
+	 * @param string|OC_User_Interface $backend default: database The backend to use for user management
 	 * @return bool
 	 *
 	 * Set the User Authentication Module
@@ -169,7 +169,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Create a new user
+	 * Create a new user
 	 * @param string $uid The username of the user to create
 	 * @param string $password The password of the new user
 	 * @throws Exception
@@ -185,7 +185,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief delete a user
+	 * delete a user
 	 * @param string $uid The username of the user to delete
 	 * @return bool
 	 *
@@ -223,7 +223,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Try to login a user
+	 * Try to login a user
 	 * @param string $uid The username of the user to log in
 	 * @param string $password The password of the user
 	 * @return boolean|null
@@ -236,7 +236,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Try to login a user, assuming authentication
+	 * Try to login a user, assuming authentication
 	 * has already happened (e.g. via Single Sign On).
 	 *
 	 * Log in a user and regenerate a new session.
@@ -262,7 +262,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Verify with Apache whether user is authenticated.
+	 * Verify with Apache whether user is authenticated.
 	 *
 	 * @return boolean|null
 	 *          true: authenticated
@@ -286,14 +286,14 @@ class OC_User {
 
 
 	/**
-	 * @brief Sets user id for session and triggers emit
+	 * Sets user id for session and triggers emit
 	 */
 	public static function setUserId($uid) {
 		OC::$session->set('user_id', $uid);
 	}
 
 	/**
-	 * @brief Sets user display name for session
+	 * Sets user display name for session
 	 * @param string $uid
 	 * @param null $displayName
 	 * @return bool Whether the display name could get set
@@ -311,7 +311,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Logs the current user out and kills all the session data
+	 * Logs the current user out and kills all the session data
 	 *
 	 * Logout, destroys session
 	 */
@@ -320,8 +320,8 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Check if the user is logged in
-	 * @returns bool
+	 * Check if the user is logged in
+	 * @return bool
 	 *
 	 * Checks if the user is logged in
 	 */
@@ -333,7 +333,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief set incognito mode, e.g. if a user wants to open a public link
+	 * set incognito mode, e.g. if a user wants to open a public link
 	 * @param bool $status
 	 */
 	public static function setIncognitoMode($status) {
@@ -358,7 +358,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Check if the user is an admin user
+	 * Check if the user is an admin user
 	 * @param string $uid uid of the admin
 	 * @return bool
 	 */
@@ -371,7 +371,7 @@ class OC_User {
 
 
 	/**
-	 * @brief get the user id of the user currently logged in.
+	 * get the user id of the user currently logged in.
 	 * @return string uid or false
 	 */
 	public static function getUser() {
@@ -384,7 +384,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief get the display name of the user currently logged in.
+	 * get the display name of the user currently logged in.
 	 * @param string $uid
 	 * @return string uid or false
 	 */
@@ -407,7 +407,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Autogenerate a password
+	 * Autogenerate a password
 	 * @return string
 	 *
 	 * generates a password
@@ -417,7 +417,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Set password
+	 * Set password
 	 * @param string $uid The username
 	 * @param string $password The new password
 	 * @param string $recoveryPassword for the encryption app to reset encryption keys
@@ -435,7 +435,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Check whether user can change his avatar
+	 * Check whether user can change his avatar
 	 * @param string $uid The username
 	 * @return bool
 	 *
@@ -451,7 +451,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Check whether user can change his password
+	 * Check whether user can change his password
 	 * @param string $uid The username
 	 * @return bool
 	 *
@@ -467,7 +467,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Check whether user can change his display name
+	 * Check whether user can change his display name
 	 * @param string $uid The username
 	 * @return bool
 	 *
@@ -483,7 +483,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Check if the password is correct
+	 * Check if the password is correct
 	 * @param string $uid The username
 	 * @param string $password The password
 	 * @return string|false user id a string on success, false otherwise
@@ -516,8 +516,8 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Get a list of all users
-	 * @returns array with all uids
+	 * Get a list of all users
+	 * @return array an array of all uids
 	 *
 	 * Get a list of all users.
 	 * @param string $search
@@ -534,7 +534,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Get a list of all users display name
+	 * Get a list of all users display name
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
@@ -552,7 +552,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief check if a user exists
+	 * check if a user exists
 	 * @param string $uid the username
 	 * @return boolean
 	 */
@@ -600,7 +600,7 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Set cookie value to use in next page load
+	 * Set cookie value to use in next page load
 	 * @param string $username username to be set
 	 * @param string $token
 	 */
@@ -609,14 +609,14 @@ class OC_User {
 	}
 
 	/**
-	 * @brief Remove cookie for "remember username"
+	 * Remove cookie for "remember username"
 	 */
 	public static function unsetMagicInCookie() {
 		self::getUserSession()->unsetMagicInCookie();
 	}
 
 	/**
-	 * @brief Returns the first active backend from self::$_usedBackends.
+	 * Returns the first active backend from self::$_usedBackends.
 	 * @return OCP\Authentication\IApacheBackend|null if no backend active, otherwise OCP\Authentication\IApacheBackend
 	 */
 	private static function findFirstActiveUsedBackend() {
diff --git a/lib/private/user/backend.php b/lib/private/user/backend.php
index f4e5618e04..56c63085f1 100644
--- a/lib/private/user/backend.php
+++ b/lib/private/user/backend.php
@@ -61,7 +61,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	);
 
 	/**
-	* @brief Get all supported actions
+	* Get all supported actions
 	* @return int bitwise-or'ed actions
 	*
 	* Returns the supported actions as int to be
@@ -79,7 +79,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	}
 
 	/**
-	* @brief Check if backend implements actions
+	* Check if backend implements actions
 	* @param int $actions bitwise-or'ed actions
 	* @return boolean
 	*
@@ -91,7 +91,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	}
 
 	/**
-	 * @brief delete a user
+	 * delete a user
 	 * @param string $uid The username of the user to delete
 	 * @return bool
 	 *
@@ -102,8 +102,8 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	}
 
 	/**
-	* @brief Get a list of all users
-	* @returns array with all uids
+	* Get a list of all users
+	* @return array an array of all uids
 	*
 	* Get a list of all users.
 	*/
@@ -112,7 +112,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	}
 
 	/**
-	* @brief check if a user exists
+	* check if a user exists
 	* @param string $uid the username
 	* @return boolean
 	*/
@@ -121,7 +121,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	}
 
 	/**
-	* @brief get the user's home directory
+	* get the user's home directory
 	* @param string $uid the username
 	* @return boolean
 	*/
@@ -130,7 +130,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	}
 
 	/**
-	 * @brief get display name of the user
+	 * get display name of the user
 	 * @param string $uid user ID of the user
 	 * @return string display name
 	 */
@@ -139,8 +139,8 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	}
 
 	/**
-	 * @brief Get a list of all display names
-	 * @returns array with  all displayNames (value) and the corresponding uids (key)
+	 * Get a list of all display names
+	 * @return array an array of  all displayNames (value) and the corresponding uids (key)
 	 *
 	 * Get a list of all display names and user ids.
 	 */
@@ -154,7 +154,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	}
 
 	/**
-	 * @brief Check if a user list is available or not
+	 * Check if a user list is available or not
 	 * @return boolean if users can be listed or not
 	 */
 	public function hasUserListings() {
diff --git a/lib/private/user/database.php b/lib/private/user/database.php
index 681f03981f..d9263f6b5d 100644
--- a/lib/private/user/database.php
+++ b/lib/private/user/database.php
@@ -56,10 +56,10 @@ class OC_User_Database extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief Create a new user
-	 * @param $uid The username of the user to create
-	 * @param $password The password of the new user
-	 * @returns true/false
+	 * Create a new user
+	 * @param string $uid The username of the user to create
+	 * @param string $password The password of the new user
+	 * @return bool
 	 *
 	 * Creates a new user. Basic checking of username is done in OC_User
 	 * itself, not in its subclasses.
@@ -78,9 +78,9 @@ class OC_User_Database extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief delete a user
-	 * @param $uid The username of the user to delete
-	 * @returns true/false
+	 * delete a user
+	 * @param string $uid The username of the user to delete
+	 * @return bool
 	 *
 	 * Deletes a user
 	 */
@@ -97,10 +97,10 @@ class OC_User_Database extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief Set password
-	 * @param $uid The username
-	 * @param $password The new password
-	 * @returns true/false
+	 * Set password
+	 * @param string $uid The username
+	 * @param string $password The new password
+	 * @return bool
 	 *
 	 * Change the password of a user
 	 */
@@ -118,10 +118,10 @@ class OC_User_Database extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief Set display name
-	 * @param $uid The username
-	 * @param $displayName The new display name
-	 * @returns true/false
+	 * Set display name
+	 * @param string $uid The username
+	 * @param string $displayName The new display name
+	 * @return bool
 	 *
 	 * Change the display name of a user
 	 */
@@ -138,8 +138,8 @@ class OC_User_Database extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief get display name of the user
-	 * @param $uid user ID of the user
+	 * get display name of the user
+	 * @param string $uid user ID of the user
 	 * @return string display name
 	 */
 	public function getDisplayName($uid) {
@@ -148,8 +148,8 @@ class OC_User_Database extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief Get a list of all display names
-	 * @returns array with  all displayNames (value) and the correspondig uids (key)
+	 * Get a list of all display names
+	 * @return array an array of  all displayNames (value) and the correspondig uids (key)
 	 *
 	 * Get a list of all display names and user ids.
 	 */
@@ -168,10 +168,10 @@ class OC_User_Database extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief Check if the password is correct
-	 * @param $uid The username
-	 * @param $password The password
-	 * @returns string
+	 * Check if the password is correct
+	 * @param string $uid The username
+	 * @param string $password The password
+	 * @return string
 	 *
 	 * Check if the password is correct without logging in the user
 	 * returns the user id or false
@@ -183,14 +183,14 @@ class OC_User_Database extends OC_User_Backend {
 		$row = $result->fetchRow();
 		if ($row) {
 			$storedHash = $row['password'];
-			if ($storedHash[0] == '$') { //the new phpass based hashing
+			if ($storedHash[0] === '$') { //the new phpass based hashing
 				$hasher = $this->getHasher();
 				if ($hasher->CheckPassword($password . OC_Config::getValue('passwordsalt', ''), $storedHash)) {
 					return $row['uid'];
 				}
 
 			//old sha1 based hashing
-			} elseif (sha1($password) == $storedHash) {
+			} elseif (sha1($password) === $storedHash) {
 				//upgrade to new hashing
 				$this->setPassword($row['uid'], $password);
 				return $row['uid'];
@@ -201,9 +201,9 @@ class OC_User_Database extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief Load an user in the cache
+	 * Load an user in the cache
 	 * @param string $uid the username
-	 * @returns boolean
+	 * @return boolean
 	 */
 	private function loadUser($uid) {
 		if (empty($this->cache[$uid])) {
@@ -225,8 +225,8 @@ class OC_User_Database extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief Get a list of all users
-	 * @returns array with all uids
+	 * Get a list of all users
+	 * @return array an array of all uids
 	 *
 	 * Get a list of all users.
 	 */
@@ -241,7 +241,7 @@ class OC_User_Database extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief check if a user exists
+	 * check if a user exists
 	 * @param string $uid the username
 	 * @return boolean
 	 */
@@ -251,7 +251,7 @@ class OC_User_Database extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief get the user's home directory
+	 * get the user's home directory
 	 * @param string $uid the username
 	 * @return string|false
 	 */
@@ -273,7 +273,7 @@ class OC_User_Database extends OC_User_Backend {
 	/**
 	 * counts the users in the database
 	 *
-	 * @return int | bool
+	 * @return int|bool
 	 */
 	public function countUsers() {
 		$query = OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`');
diff --git a/lib/private/user/dummy.php b/lib/private/user/dummy.php
index 2fb51d02de..776168048f 100644
--- a/lib/private/user/dummy.php
+++ b/lib/private/user/dummy.php
@@ -28,7 +28,7 @@ class OC_User_Dummy extends OC_User_Backend {
 	private $users = array();
 
 	/**
-	 * @brief Create a new user
+	 * Create a new user
 	 * @param string $uid The username of the user to create
 	 * @param string $password The password of the new user
 	 * @return bool
@@ -46,7 +46,7 @@ class OC_User_Dummy extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief delete a user
+	 * delete a user
 	 * @param string $uid The username of the user to delete
 	 * @return bool
 	 *
@@ -62,7 +62,7 @@ class OC_User_Dummy extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief Set password
+	 * Set password
 	 * @param string $uid The username
 	 * @param string $password The new password
 	 * @return bool
@@ -79,7 +79,7 @@ class OC_User_Dummy extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief Check if the password is correct
+	 * Check if the password is correct
 	 * @param string $uid The username
 	 * @param string $password The password
 	 * @return string
@@ -96,7 +96,7 @@ class OC_User_Dummy extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief Get a list of all users
+	 * Get a list of all users
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
@@ -109,7 +109,7 @@ class OC_User_Dummy extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief check if a user exists
+	 * check if a user exists
 	 * @param string $uid the username
 	 * @return boolean
 	 */
@@ -127,7 +127,7 @@ class OC_User_Dummy extends OC_User_Backend {
 	/**
 	 * counts the users in the database
 	 *
-	 * @return int | bool
+	 * @return int|bool
 	 */
 	public function countUsers() {
 		return 0;
diff --git a/lib/private/user/example.php b/lib/private/user/example.php
index b2d0dc2541..db21d6f9e5 100644
--- a/lib/private/user/example.php
+++ b/lib/private/user/example.php
@@ -27,10 +27,10 @@
  */
 abstract class OC_User_Example extends OC_User_Backend {
 	/**
-		* @brief Create a new user
-		* @param $uid The username of the user to create
-		* @param $password The password of the new user
-		* @returns true/false
+		* Create a new user
+		* @param string $uid The username of the user to create
+		* @param string $password The password of the new user
+		* @return bool
 		*
 		* Creates a new user. Basic checking of username is done in OC_User
 		* itself, not in its subclasses.
@@ -38,20 +38,20 @@ abstract class OC_User_Example extends OC_User_Backend {
 	abstract public function createUser($uid, $password);
 
 	/**
-		* @brief Set password
-		* @param $uid The username
-		* @param $password The new password
-		* @returns true/false
+		* Set password
+		* @param string $uid The username
+		* @param string $password The new password
+		* @return bool
 		*
 		* Change the password of a user
 		*/
 	abstract public function setPassword($uid, $password);
 
 	/**
-		* @brief Check if the password is correct
-		* @param $uid The username
-		* @param $password The password
-		* @returns string
+		* Check if the password is correct
+		* @param string $uid The username
+		* @param string $password The password
+		* @return string
 		*
 		* Check if the password is correct without logging in the user
 		* returns the user id or false
@@ -59,9 +59,9 @@ abstract class OC_User_Example extends OC_User_Backend {
 	abstract public function checkPassword($uid, $password);
 
 	/**
-		* @brief get the user's home directory
-		* @param $uid The username
-		* @returns string
+		* get the user's home directory
+		* @param string $uid The username
+		* @return string
 		*
 		* get the user's home directory
 		* returns the path or false
diff --git a/lib/private/user/http.php b/lib/private/user/http.php
index a039452101..2bb8b4c864 100644
--- a/lib/private/user/http.php
+++ b/lib/private/user/http.php
@@ -27,7 +27,7 @@
 class OC_User_HTTP extends OC_User_Backend {
 	/**
 	 * split http://user@host/path into a user and url part
-	 * @param string path
+	 * @param string $url
 	 * @return array
 	 */
 	private function parseUrl($url) {
@@ -46,7 +46,7 @@ class OC_User_HTTP extends OC_User_Backend {
 
 	/**
 	 * check if an url is a valid login
-	 * @param string url
+	 * @param string $url
 	 * @return boolean
 	 */
 	private function matchUrl($url) {
@@ -54,10 +54,10 @@ class OC_User_HTTP extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief Check if the password is correct
-	 * @param $uid The username
-	 * @param $password The password
-	 * @returns string
+	 * Check if the password is correct
+	 * @param string $uid The username
+	 * @param string $password The password
+	 * @return string
 	 *
 	 * Check if the password is correct without logging in the user
 	 * returns the user id or false
@@ -87,7 +87,7 @@ class OC_User_HTTP extends OC_User_Backend {
 	}
 
 	/**
-	 * @brief check if a user exists
+	 * check if a user exists
 	 * @param string $uid the username
 	 * @return boolean
 	 */
@@ -96,7 +96,7 @@ class OC_User_HTTP extends OC_User_Backend {
 	}
 
 	/**
-	* @brief get the user's home directory
+	* get the user's home directory
 	* @param string $uid the username
 	* @return string|false
 	*/
diff --git a/lib/private/user/interface.php b/lib/private/user/interface.php
index cdcab3e5d0..4cdc47479a 100644
--- a/lib/private/user/interface.php
+++ b/lib/private/user/interface.php
@@ -24,58 +24,54 @@
 interface OC_User_Interface {
 
 	/**
-	* @brief Check if backend implements actions
+	* Check if backend implements actions
 	* @param $actions bitwise-or'ed actions
-	* @returns boolean
+	* @return boolean
 	*
 	* Returns the supported actions as int to be
 	* compared with OC_USER_BACKEND_CREATE_USER etc.
-	* @return boolean
 	*/
 	public function implementsActions($actions);
 
 	/**
-	* @brief delete a user
-	* @param $uid The username of the user to delete
-	* @returns true/false
-	*
-	* Deletes a user
-	* @return boolean
+	* delete a user
+	* @param string $uid The username of the user to delete
+	* @return bool
 	*/
 	public function deleteUser($uid);
 
 	/**
-	* @brief Get a list of all users
-	* @returns array with all uids
+	* Get a list of all users
+	* @return array an array of all uids
 	*
 	* Get a list of all users.
 	*/
 	public function getUsers($search = '', $limit = null, $offset = null);
 
 	/**
-	* @brief check if a user exists
+	* check if a user exists
 	* @param string $uid the username
 	* @return boolean
 	*/
 	public function userExists($uid);
 
 	/**
-	 * @brief get display name of the user
-	 * @param $uid user ID of the user
-	 * @return display name
+	 * get display name of the user
+	 * @param string $uid user ID of the user
+	 * @return string display name
 	 */
 	public function getDisplayName($uid);
 
 	/**
-	 * @brief Get a list of all display names
-	 * @returns array with  all displayNames (value) and the corresponding uids (key)
+	 * Get a list of all display names
+	 * @return array an array of  all displayNames (value) and the corresponding uids (key)
 	 *
 	 * Get a list of all display names and user ids.
 	 */
 	public function getDisplayNames($search = '', $limit = null, $offset = null);
 
 	/**
-	 * @brief Check if a user list is available or not
+	 * Check if a user list is available or not
 	 * @return boolean if users can be listed or not
 	 */
 	public function hasUserListings();
diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php
index 14698452e8..0fcf1ceb6a 100644
--- a/lib/private/user/manager.php
+++ b/lib/private/user/manager.php
@@ -26,7 +26,7 @@ use OC\Hooks\PublicEmitter;
  */
 class Manager extends PublicEmitter {
 	/**
-	 * @var \OC_User_Backend[] $backends
+	 * @var \OC_User_Interface[] $backends
 	 */
 	private $backends = array();
 
@@ -57,7 +57,7 @@ class Manager extends PublicEmitter {
 	/**
 	 * register a user backend
 	 *
-	 * @param \OC_User_Backend $backend
+	 * @param \OC_User_Interface $backend
 	 */
 	public function registerBackend($backend) {
 		$this->backends[] = $backend;
@@ -66,7 +66,7 @@ class Manager extends PublicEmitter {
 	/**
 	 * remove a user backend
 	 *
-	 * @param \OC_User_Backend $backend
+	 * @param \OC_User_Interface $backend
 	 */
 	public function removeBackend($backend) {
 		$this->cachedUsers = array();
@@ -105,7 +105,7 @@ class Manager extends PublicEmitter {
 	 * get or construct the user object
 	 *
 	 * @param string $uid
-	 * @param \OC_User_Backend $backend
+	 * @param \OC_User_Interface $backend
 	 * @return \OC\User\User
 	 */
 	protected function getUserObject($uid, $backend) {
@@ -174,12 +174,12 @@ class Manager extends PublicEmitter {
 			$backendUsers = $backend->getUsers($pattern, $limit, $offset);
 			if (is_array($backendUsers)) {
 				foreach ($backendUsers as $uid) {
-					$users[] = $this->getUserObject($uid, $backend);
+					$users[$uid] = $this->getUserObject($uid, $backend);
 				}
 			}
 		}
 
-		usort($users, function ($a, $b) {
+		uasort($users, function ($a, $b) {
 			/**
 			 * @var \OC\User\User $a
 			 * @var \OC\User\User $b
@@ -222,7 +222,7 @@ class Manager extends PublicEmitter {
 	 * @param string $uid
 	 * @param string $password
 	 * @throws \Exception
-	 * @return bool | \OC\User\User the created user of false
+	 * @return bool|\OC\User\User the created user of false
 	 */
 	public function createUser($uid, $password) {
 		$l = \OC_L10N::get('lib');
@@ -261,7 +261,7 @@ class Manager extends PublicEmitter {
 	/**
 	 * returns how many users per backend exist (if supported by backend)
 	 *
-	 * @return array with backend class as key and count number as value
+	 * @return array an array of backend class as key and count number as value
 	 */
 	public function countUsers() {
 		$userCountStatistics = array();
diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index 1740bad5ab..3d10b134b8 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -82,7 +82,7 @@ class Session implements Emitter, \OCP\IUserSession {
 	/**
 	 * set the currently active user
 	 *
-	 * @param \OC\User\User $user
+	 * @param \OC\User\User|null $user
 	 */
 	public function setUser($user) {
 		if (is_null($user)) {
@@ -115,7 +115,7 @@ class Session implements Emitter, \OCP\IUserSession {
 	/**
 	 * set the login name
 	 *
-	 * @param string $loginName for the logged in user
+	 * @param string|null $loginName for the logged in user
 	 */
 	public function setLoginName($loginName) {
 		if (is_null($loginName)) {
@@ -191,7 +191,7 @@ class Session implements Emitter, \OCP\IUserSession {
 		$expires = time() + \OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
 		setcookie("oc_username", $username, $expires, \OC::$WEBROOT, '', $secure_cookie);
 		setcookie("oc_token", $token, $expires, \OC::$WEBROOT, '', $secure_cookie, true);
-		setcookie("oc_remember_login", true, $expires, \OC::$WEBROOT, '', $secure_cookie);
+		setcookie("oc_remember_login", "1", $expires, \OC::$WEBROOT, '', $secure_cookie);
 	}
 
 	/**
diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index ef5364cbf7..bc5c541e52 100644
--- a/lib/private/user/user.php
+++ b/lib/private/user/user.php
@@ -23,7 +23,7 @@ class User {
 	private $displayName;
 
 	/**
-	 * @var \OC_User_Backend $backend
+	 * @var \OC_User_Interface $backend
 	 */
 	private $backend;
 
@@ -33,7 +33,7 @@ class User {
 	private $enabled;
 
 	/**
-	 * @var Emitter | Manager $emitter
+	 * @var Emitter|Manager $emitter
 	 */
 	private $emitter;
 
@@ -49,17 +49,12 @@ class User {
 
 	/**
 	 * @param string $uid
-	 * @param \OC_User_Backend $backend
+	 * @param \OC_User_Interface $backend
 	 * @param \OC\Hooks\Emitter $emitter
 	 * @param \OC\AllConfig $config
 	 */
 	public function __construct($uid, $backend, $emitter = null, $config = null) {
 		$this->uid = $uid;
-		if ($backend and $backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {
-			$this->displayName = $backend->getDisplayName($uid);
-		} else {
-			$this->displayName = $uid;
-		}
 		$this->backend = $backend;
 		$this->emitter = $emitter;
 		$this->config = $config;
@@ -86,6 +81,13 @@ class User {
 	 * @return string
 	 */
 	public function getDisplayName() {
+		if (!isset($this->displayName)) {
+			if ($this->backend and $this->backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {
+				$this->displayName = $this->backend->getDisplayName($this->uid);
+			} else {
+				$this->displayName = $this->uid;
+			}
+		}
 		return $this->displayName;
 	}
 
diff --git a/lib/private/util.php b/lib/private/util.php
index e6aa7b061b..c018721afe 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -13,7 +13,7 @@ class OC_Util {
 	private static $fsSetup=false;
 
 	/**
-	 * @brief Can be set up
+	 * Can be set up
 	 * @param string $user
 	 * @return boolean
 	 * @description configure the initial filesystem based on the configuration
@@ -86,6 +86,16 @@ class OC_Util {
 		return true;
 	}
 
+	/**
+	 * check if a password is required for each public link
+	 * @return boolean
+	 */
+	public static function isPublicLinkPasswordRequired() {
+		$appConfig = \OC::$server->getAppConfig();
+		$enforcePassword = $appConfig->getValue('core', 'shareapi_enforce_links_password', 'no');
+		return ($enforcePassword === 'yes') ? true : false;
+	}
+
 	/**
 	 * Get the quota of a user
 	 * @param string $user
@@ -105,7 +115,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief copies the user skeleton files into the fresh user home files
+	 * copies the user skeleton files into the fresh user home files
 	 * @param string $userDirectory
 	 */
 	public static function copySkeleton($userDirectory) {
@@ -113,7 +123,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief copies a directory recursively
+	 * copies a directory recursively
 	 * @param string $source
 	 * @param string $target
 	 * @return void
@@ -143,7 +153,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief get the current installed version of ownCloud
+	 * get the current installed version of ownCloud
 	 * @return array
 	 */
 	public static function getVersion() {
@@ -152,7 +162,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief get the current installed version string of ownCloud
+	 * get the current installed version string of ownCloud
 	 * @return string
 	 */
 	public static function getVersionString() {
@@ -213,7 +223,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief add a javascript file
+	 * add a javascript file
 	 *
 	 * @param string $application
 	 * @param string|null $file filename
@@ -232,7 +242,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief add a css file
+	 * add a css file
 	 *
 	 * @param string $application
 	 * @param string|null $file filename
@@ -251,7 +261,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Add a custom element to the header
+	 * Add a custom element to the header
 	 * @param string $tag tag name of the element
 	 * @param array $attributes array of attributes for the element
 	 * @param string $text the text content for the element
@@ -266,7 +276,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief formats a timestamp in the "right" way
+	 * formats a timestamp in the "right" way
 	 *
 	 * @param int $timestamp
 	 * @param bool $dateOnly option to omit time from the result
@@ -286,7 +296,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief check if the current server configuration is suitable for ownCloud
+	 * check if the current server configuration is suitable for ownCloud
 	 * @return array arrays with error messages and hints
 	 */
 	public static function checkServer() {
@@ -299,7 +309,7 @@ class OC_Util {
 		}
 
 		// Assume that if checkServer() succeeded before in this session, then all is fine.
-		if(\OC::$session->exists('checkServer_suceeded') && \OC::$session->get('checkServer_suceeded')) {
+		if(\OC::$session->exists('checkServer_succeeded') && \OC::$session->get('checkServer_succeeded')) {
 			return $errors;
 		}
 
@@ -491,7 +501,7 @@ class OC_Util {
 		$errors = array_merge($errors, self::checkDatabaseVersion());
 
 		// Cache the result of this function
-		\OC::$session->set('checkServer_suceeded', count($errors) == 0);
+		\OC::$session->set('checkServer_succeeded', count($errors) == 0);
 
 		return $errors;
 	}
@@ -530,7 +540,7 @@ class OC_Util {
 
 
 	/**
-	 * @brief check if there are still some encrypted files stored
+	 * check if there are still some encrypted files stored
 	 * @return boolean
 	 */
 	public static function encryptedFiles() {
@@ -551,7 +561,28 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Check for correct file permissions of data directory
+	 * check if a backup from the encryption keys exists
+	 * @return boolean
+	 */
+	public static function backupKeysExists() {
+		//check if encryption was enabled in the past
+		$backupExists = false;
+		if (OC_App::isEnabled('files_encryption') === false) {
+			$view = new OC\Files\View('/' . OCP\User::getUser());
+			$backupPath = '/files_encryption/keyfiles.backup';
+			if ($view->is_dir($backupPath)) {
+				$dircontent = $view->getDirectoryContent($backupPath);
+				if (!empty($dircontent)) {
+					$backupExists = true;
+				}
+			}
+		}
+
+		return $backupExists;
+	}
+
+	/**
+	 * Check for correct file permissions of data directory
 	 * @param string $dataDirectory
 	 * @return array arrays with error messages and hints
 	 */
@@ -624,7 +655,7 @@ class OC_Util {
 
 
 	/**
-	 * @brief Check if the app is enabled, redirects to home if not
+	 * Check if the app is enabled, redirects to home if not
 	 * @param string $app
 	 * @return void
 	 */
@@ -651,7 +682,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Check if the user is a admin, redirects to home if not
+	 * Check if the user is a admin, redirects to home if not
 	 * @return void
 	 */
 	public static function checkAdminUser() {
@@ -684,7 +715,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Check if the user is a subadmin, redirects to home if not
+	 * Check if the user is a subadmin, redirects to home if not
 	 * @return null|boolean $groups where the current user is subadmin
 	 */
 	public static function checkSubAdminUser() {
@@ -697,7 +728,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Redirect to the user default page
+	 * Redirect to the user default page
 	 * @return void
 	 */
 	public static function redirectToDefaultPage() {
@@ -721,7 +752,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief get an id unique for this instance
+	 * get an id unique for this instance
 	 * @return string
 	 */
 	public static function getInstanceId() {
@@ -735,7 +766,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Static lifespan (in seconds) when a request token expires.
+	 * Static lifespan (in seconds) when a request token expires.
 	 * @see OC_Util::callRegister()
 	 * @see OC_Util::isCallRegistered()
 	 * @description
@@ -746,9 +777,9 @@ class OC_Util {
 	public static $callLifespan = 3600; // 3600 secs = 1 hour
 
 	/**
-	 * @brief Register an get/post call. Important to prevent CSRF attacks.
+	 * Register an get/post call. Important to prevent CSRF attacks.
 	 * @todo Write howto: CSRF protection guide
-	 * @return $token Generated token.
+	 * @return string Generated token.
 	 * @description
 	 * Creates a 'request token' (random) and stores it inside the session.
 	 * Ever subsequent (ajax) request must use such a valid token to succeed,
@@ -771,7 +802,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Check an ajax get/post call if the request token is valid.
+	 * Check an ajax get/post call if the request token is valid.
 	 * @return boolean False if request token is not set or is invalid.
 	 * @see OC_Util::$callLifespan
 	 * @see OC_Util::callRegister()
@@ -781,7 +812,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Check an ajax get/post call if the request token is valid. exit if not.
+	 * Check an ajax get/post call if the request token is valid. Exit if not.
 	 * @todo Write howto
 	 * @return void
 	 */
@@ -792,13 +823,13 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Public function to sanitize HTML
+	 * Public function to sanitize HTML
 	 *
 	 * This function is used to sanitize HTML and should be applied on any
 	 * string or array of strings before displaying it on a web page.
 	 *
-	 * @param string|array of strings
-	 * @return array with sanitized strings or a single sanitized string, depends on the input parameter.
+	 * @param string|array &$value
+	 * @return string|array an array of sanitized strings or a single sanitized string, depends on the input parameter.
 	 */
 	public static function sanitizeHTML( &$value ) {
 		if (is_array($value)) {
@@ -811,7 +842,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Public function to encode url parameters
+	 * Public function to encode url parameters
 	 *
 	 * This function is used to encode path to file before output.
 	 * Encoding is done according to RFC 3986 with one exception:
@@ -827,7 +858,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Check if the .htaccess file is working
+	 * Check if the .htaccess file is working
 	 * @throws OC\HintException If the testfile can't get written.
 	 * @return bool
 	 * @description Check if the .htaccess file is working by creating a test
@@ -837,7 +868,7 @@ class OC_Util {
 		if (!\OC_Config::getValue("check_for_working_htaccess", true)) {
 			return true;
 		}
-		
+
 		// testdata
 		$fileName = '/htaccesstest.txt';
 		$testContent = 'testcontent';
@@ -875,7 +906,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief test if webDAV is working properly
+	 * test if webDAV is working properly
 	 * @return bool
 	 * @description
 	 * The basic assumption is that if the server returns 401/Not Authenticated for an unauthenticated PROPFIND
@@ -939,7 +970,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Check if the PHP module fileinfo is loaded.
+	 * Check if the PHP module fileinfo is loaded.
 	 * @return bool
 	 */
 	public static function fileInfoLoaded() {
@@ -947,7 +978,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Check if a PHP version older then 5.3.8 is installed.
+	 * Check if a PHP version older then 5.3.8 is installed.
 	 * @return bool
 	 */
 	public static function isPHPoutdated() {
@@ -955,7 +986,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Check if the ownCloud server can connect to the internet
+	 * Check if the ownCloud server can connect to the internet
 	 * @return bool
 	 */
 	public static function isInternetConnectionWorking() {
@@ -987,7 +1018,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Check if the connection to the internet is disabled on purpose
+	 * Check if the connection to the internet is disabled on purpose
 	 * @return string
 	 */
 	public static function isInternetConnectionEnabled(){
@@ -995,7 +1026,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief clear all levels of output buffering
+	 * clear all levels of output buffering
 	 * @return void
 	 */
 	public static function obEnd(){
@@ -1006,9 +1037,9 @@ class OC_Util {
 
 
 	/**
-	 * @brief Generates a cryptographic secure pseudo-random string
-	 * @param Int $length of the random string
-	 * @return String
+	 * Generates a cryptographic secure pseudo-random string
+	 * @param int $length of the random string
+	 * @return string
 	 * Please also update secureRNGAvailable if you change something here
 	 */
 	public static function generateRandomBytes($length = 30) {
@@ -1043,7 +1074,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Checks if a secure random number generator is available
+	 * Checks if a secure random number generator is available
 	 * @return bool
 	 */
 	public static function secureRNGAvailable() {
@@ -1082,7 +1113,7 @@ class OC_Util {
 			curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
 			curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10);
 			curl_setopt($curl, CURLOPT_URL, $url);
-			
+
 
 			curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
 			if(OC_Config::getValue('proxy', '') != '') {
@@ -1091,24 +1122,23 @@ class OC_Util {
 			if(OC_Config::getValue('proxyuserpwd', '') != '') {
 				curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('proxyuserpwd'));
 			}
-			
-			if (ini_get('open_basedir') === '' && ini_get('safe_mode' === 'Off')) { 
+
+			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);
-					
+				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);
+						curl_setopt($rcurl, CURLOPT_URL, $newURL);
 						$header = curl_exec($rcurl);
 						if (curl_errno($rcurl)) {
 							$code = 0;
@@ -1116,7 +1146,7 @@ class OC_Util {
 							$code = curl_getinfo($rcurl, CURLINFO_HTTP_CODE);
 							if ($code == 301 || $code == 302) {
 								preg_match('/Location:(.*?)\n/', $header, $matches);
-								$newurl = trim(array_pop($matches));
+								$newURL = trim(array_pop($matches));
 							} else {
 								$code = 0;
 							}
@@ -1124,10 +1154,10 @@ class OC_Util {
 					} while ($code && --$mr);
 					curl_close($rcurl);
 					if ($mr > 0) {
-						curl_setopt($curl, CURLOPT_URL, $newurl);
-					} 
+						curl_setopt($curl, CURLOPT_URL, $newURL);
+					}
 				}
-				
+
 				if($mr == 0 && $max_redirects > 0) {
 					$data = false;
 				} else {
@@ -1196,7 +1226,7 @@ class OC_Util {
 	}
 
 	/**
-	 * @brief Clear the opcode cache if one exists
+	 * Clear the opcode cache if one exists
 	 * This is necessary for writing to the config file
 	 * in case the opcode cache does not re-validate files
 	 * @return void
@@ -1267,7 +1297,7 @@ class OC_Util {
 
 	/**
 	 * Returns whether the given file name is valid
-	 * @param $file string file name to check
+	 * @param string $file file name to check
 	 * @return bool true if the file name is valid, false otherwise
 	 */
 	public static function isValidFileName($file) {
diff --git a/lib/private/vobject.php b/lib/private/vobject.php
index a3e9f7ef79..94e3470ff0 100644
--- a/lib/private/vobject.php
+++ b/lib/private/vobject.php
@@ -25,28 +25,28 @@
  */
 class OC_VObject{
 	/** @var Sabre\VObject\Component */
-	protected $vobject;
+	protected $vObject;
 
 	/**
-	 * @returns Sabre\VObject\Component
+	 * @return Sabre\VObject\Component
 	 */
 	public function getVObject() {
-		return $this->vobject;
+		return $this->vObject;
 	}
 
 	/**
-	 * @brief Parses the VObject
+	 * Parses the VObject
 	 * @param string $data VObject as string
-	 * @returns Sabre\VObject\Reader|null
+	 * @return Sabre\VObject\Reader|null
 	 */
 	public static function parse($data) {
 		try {
 			Sabre\VObject\Property::$classMap['LAST-MODIFIED'] = 'Sabre\VObject\Property\DateTime';
-			$vobject = Sabre\VObject\Reader::read($data);
-			if ($vobject instanceof Sabre\VObject\Component) {
-				$vobject = new OC_VObject($vobject);
+			$vObject = Sabre\VObject\Reader::read($data);
+			if ($vObject instanceof Sabre\VObject\Component) {
+				$vObject = new OC_VObject($vObject);
 			}
-			return $vobject;
+			return $vObject;
 		} catch (Exception $e) {
 			OC_Log::write('vobject', $e->getMessage(), OC_Log::ERROR);
 			return null;
@@ -54,7 +54,7 @@ class OC_VObject{
 	}
 
 	/**
-	 * @brief Escapes semicolons
+	 * Escapes semicolons
 	 * @param array $value
 	 * @return string
 	 */
@@ -66,7 +66,7 @@ class OC_VObject{
 	}
 
 	/**
-	 * @brief Creates an array out of a multivalue property
+	 * Creates an array out of a multivalue property
 	 * @param string $value
 	 * @return array
 	 */
@@ -89,34 +89,34 @@ class OC_VObject{
 
 	/**
 	 * Constructor
-	 * @param Sabre\VObject\Component or string
+	 * @param Sabre\VObject\Component|string $vobject_or_name
 	 */
 	public function __construct($vobject_or_name) {
 		if (is_object($vobject_or_name)) {
-			$this->vobject = $vobject_or_name;
+			$this->vObject = $vobject_or_name;
 		} else {
-			$this->vobject = new Sabre\VObject\Component($vobject_or_name);
+			$this->vObject = new Sabre\VObject\Component($vobject_or_name);
 		}
 	}
 
 	/**
 	 * @todo Write documentation
-	 * @param $item
+	 * @param \OC_VObject|\Sabre\VObject\Component $item
 	 * @param null $itemValue
 	 */
 	public function add($item, $itemValue = null) {
 		if ($item instanceof OC_VObject) {
 			$item = $item->getVObject();
 		}
-		$this->vobject->add($item, $itemValue);
+		$this->vObject->add($item, $itemValue);
 	}
 
 	/**
-	 * @brief Add property to vobject
+	 * Add property to vobject
 	 * @param object $name of property
 	 * @param object $value of property
 	 * @param array|object $parameters of property
-	 * @returns Sabre\VObject\Property newly created
+	 * @return Sabre\VObject\Property newly created
 	 */
 	public function addProperty($name, $value, $parameters=array()) {
 		if(is_array($value)) {
@@ -127,26 +127,26 @@ class OC_VObject{
 			$property->parameters[] = new Sabre\VObject\Parameter($name, $value);
 		}
 
-		$this->vobject->add($property);
+		$this->vObject->add($property);
 		return $property;
 	}
 
 	public function setUID() {
 		$uid = substr(md5(rand().time()), 0, 10);
-		$this->vobject->add('UID', $uid);
+		$this->vObject->add('UID', $uid);
 	}
 
 	/**
 	 * @todo Write documentation
-	 * @param mixed  $name
+	 * @param mixed $name
 	 * @param string $string
 	 */
 	public function setString($name, $string) {
 		if ($string != '') {
 			$string = strtr($string, array("\r\n"=>"\n"));
-			$this->vobject->__set($name, $string);
+			$this->vObject->__set($name, $string);
 		}else{
-			$this->vobject->__unset($name);
+			$this->vObject->__unset($name);
 		}
 	}
 
@@ -167,31 +167,31 @@ class OC_VObject{
 		if ($datetime instanceof DateTime) {
 			$datetime_element = new Sabre\VObject\Property\DateTime($name);
 			$datetime_element->setDateTime($datetime, $dateType);
-			$this->vobject->__set($name, $datetime_element);
+			$this->vObject->__set($name, $datetime_element);
 		}else{
-			$this->vobject->__unset($name);
+			$this->vObject->__unset($name);
 		}
 	}
 
 	/**
 	 * @todo Write documentation
-	 * @param $name
+	 * @param string $name
 	 * @return string
 	 */
 	public function getAsString($name) {
-		return $this->vobject->__isset($name) ?
-			$this->vobject->__get($name)->value :
+		return $this->vObject->__isset($name) ?
+			$this->vObject->__get($name)->value :
 			'';
 	}
 
 	/**
 	 * @todo Write documentation
-	 * @param $name
+	 * @param string $name
 	 * @return array
 	 */
 	public function getAsArray($name) {
 		$values = array();
-		if ($this->vobject->__isset($name)) {
+		if ($this->vObject->__isset($name)) {
 			$values = explode(',', $this->getAsString($name));
 			$values = array_map('trim', $values);
 		}
@@ -200,14 +200,14 @@ class OC_VObject{
 
 	/**
 	 * @todo Write documentation
-	 * @param $name
+	 * @param string $name
 	 * @return array|OC_VObject|\Sabre\VObject\Property
 	 */
 	public function &__get($name) {
 		if ($name == 'children') {
-			return $this->vobject->children;
+			return $this->vObject->children;
 		}
-		$return = $this->vobject->__get($name);
+		$return = $this->vObject->__get($name);
 		if ($return instanceof Sabre\VObject\Component) {
 			$return = new OC_VObject($return);
 		}
@@ -220,7 +220,7 @@ class OC_VObject{
 	 * @param string $value
 	 */
 	public function __set($name, $value) {
-		return $this->vobject->__set($name, $value);
+		return $this->vObject->__set($name, $value);
 	}
 
 	/**
@@ -228,7 +228,7 @@ class OC_VObject{
 	 * @param string $name
 	 */
 	public function __unset($name) {
-		return $this->vobject->__unset($name);
+		return $this->vObject->__unset($name);
 	}
 
 	/**
@@ -237,16 +237,16 @@ class OC_VObject{
 	 * @return bool
 	 */
 	public function __isset($name) {
-		return $this->vobject->__isset($name);
+		return $this->vObject->__isset($name);
 	}
 
 	/**
 	 * @todo Write documentation
-	 * @param $function
-	 * @param $arguments
+	 * @param callable $function
+	 * @param array $arguments
 	 * @return mixed
 	 */
 	public function __call($function, $arguments) {
-		return call_user_func_array(array($this->vobject, $function), $arguments);
+		return call_user_func_array(array($this->vObject, $function), $arguments);
 	}
 }
diff --git a/lib/public/app.php b/lib/public/app.php
index 96162299ec..bef4e96ae0 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -36,7 +36,7 @@ namespace OCP;
 class App {
 	/**
 	 * Makes ownCloud aware of this app
-	 * @param array with all information
+	 * @param array $data with all information
 	 * @return boolean
 	 *
 	 * @deprecated This method is deprecated. Do not call it anymore.
@@ -49,7 +49,7 @@ class App {
 
 	/**
 	 * Adds an entry to the navigation
-	 * @param array containing the data
+	 * @param array $data containing the data
 	 * @return boolean
 	 *
 	 * This function adds a new entry to the navigation visible to users. $data
@@ -70,7 +70,7 @@ class App {
 
 	/**
 	 * Marks a navigation entry as active
-	 * @param string id of the entry
+	 * @param string $id id of the entry
 	 * @return boolean
 	 *
 	 * This function sets a navigation entry as active and removes the 'active'
@@ -83,8 +83,8 @@ class App {
 
 	/**
 	 * Register a Configuration Screen that should appear in the personal settings section.
-	 * @param $app string appid
-	 * @param $page string page to be included
+	 * @param string $app appid
+	 * @param string $page page to be included
 	 * @return void
 	*/
 	public static function registerPersonal( $app, $page ) {
diff --git a/lib/public/appframework/apicontroller.php b/lib/public/appframework/apicontroller.php
new file mode 100644
index 0000000000..5272f3ed52
--- /dev/null
+++ b/lib/public/appframework/apicontroller.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Public interface of ownCloud for apps to use.
+ * AppFramework\Controller class
+ */
+
+namespace OCP\AppFramework;
+
+use OCP\AppFramework\Http\Response;
+use OCP\IRequest;
+
+
+/**
+ * Base class to inherit your controllers from that are used for RESTful APIs
+ */
+abstract class ApiController extends Controller {
+
+    private $corsMethods;
+    private $corsAllowedHeaders;
+    private $corsMaxAge;
+
+    /**
+     * constructor of the controller
+     * @param string $appName the name of the app
+     * @param IRequest $request an instance of the request
+     * @param string $corsMethods: comma seperated string of HTTP verbs which 
+     * should be allowed for websites or webapps when calling your API, defaults to
+     * 'PUT, POST, GET, DELETE, PATCH'
+     * @param string $corsAllowedHeaders: comma seperated string of HTTP headers
+     * which should be allowed for websites or webapps when calling your API, 
+     * defaults to 'Authorization, Content-Type, Accept'
+     * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS
+     * request should be cached, defaults to 1728000 seconds
+     */
+    public function __construct($appName, 
+                                IRequest $request, 
+                                $corsMethods='PUT, POST, GET, DELETE, PATCH',
+                                $corsAllowedHeaders='Authorization, Content-Type, Accept',
+                                $corsMaxAge=1728000){
+        parent::__construct($appName, $request);
+        $this->corsMethods = $corsMethods;
+        $this->corsAllowedHeaders = $corsAllowedHeaders;
+        $this->corsMaxAge = $corsMaxAge;
+    }
+
+
+    /**
+     * This method implements a preflighted cors response for you that you can
+     * link to for the options request
+     *
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @PublicPage
+     */
+    public function preflightedCors() {
+        if(isset($this->request->server['HTTP_ORIGIN'])) {
+            $origin = $this->request->server['HTTP_ORIGIN'];
+        } else {
+            $origin = '*';
+        }
+
+        $response = new Response();
+        $response->addHeader('Access-Control-Allow-Origin', $origin);
+        $response->addHeader('Access-Control-Allow-Methods', $this->corsMethods);
+        $response->addHeader('Access-Control-Max-Age', $this->corsMaxAge);
+        $response->addHeader('Access-Control-Allow-Headers', $this->corsAllowedHeaders);
+        $response->addHeader('Access-Control-Allow-Credentials', 'false');
+        return $response;
+    }
+
+
+}
diff --git a/lib/public/appframework/controller.php b/lib/public/appframework/controller.php
index 758f0a8008..50b5ed3a80 100644
--- a/lib/public/appframework/controller.php
+++ b/lib/public/appframework/controller.php
@@ -3,7 +3,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012, 2014 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -28,7 +28,8 @@
 namespace OCP\AppFramework;
 
 use OCP\AppFramework\Http\TemplateResponse;
-use OCP\AppFramework\IAppContainer;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Http\IResponseSerializer;
 use OCP\IRequest;
 
 
@@ -49,19 +50,86 @@ abstract class Controller {
 	 */
 	protected $request;
 
+	private $serializer;
+	private $responders;
+
 	/**
 	 * constructor of the controller
 	 * @param string $appName the name of the app
 	 * @param IRequest $request an instance of the request
+	 * @param string $corsMethods: comma seperated string of HTTP verbs which 
+	 * should be allowed for websites or webapps when calling your API, defaults to
+	 * 'PUT, POST, GET, DELETE, PATCH'
+	 * @param string $corsAllowedHeaders: comma seperated string of HTTP headers
+	 * which should be allowed for websites or webapps when calling your API, 
+	 * defaults to 'Authorization, Content-Type, Accept'
+	 * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS
+	 * request should be cached, defaults to 1728000 seconds
 	 */
-	public function __construct($appName, IRequest $request){
+	public function __construct($appName, 
+	                            IRequest $request){
 		$this->appName = $appName;
 		$this->request = $request;
+
+		// default responders
+		$this->responders = array(
+			'json' => function ($response) {
+				return new JSONResponse($response);
+			}
+		);
+	}
+
+
+	/** 
+	 * Registers a serializer that is executed before a formatter is being 
+	 * called, useful for turning any data into PHP arrays that can be used
+	 * by a JSONResponse for instance
+	 * @param IResponseSerializer $serializer 
+	 */
+	protected function registerSerializer(IResponseSerializer $serializer) {
+		$this->serializer = $serializer;
+	}
+
+
+	/**
+	 * Registers a formatter for a type
+	 * @param string $format
+	 * @param \Closure $responder
+	 */
+	protected function registerResponder($format, \Closure $responder) {
+		$this->responders[$format] = $responder;
+	}
+
+
+	/**
+	 * Serializes and formats a response
+	 * @param mixed $response the value that was returned from a controller and
+	 * is not a Response instance
+	 * @param string $format the format for which a formatter has been registered
+	 * @throws \DomainException if format does not match a registered formatter
+	 * @return Response
+	 */
+	public function buildResponse($response, $format='json') {
+		if(array_key_exists($format, $this->responders)) {
+
+			if ($this->serializer) {
+				$response = $this->serializer->serialize($response);
+			}
+
+			$responder = $this->responders[$format];
+			
+			return $responder($response);
+
+		} else {
+			throw new \DomainException('No responder registered for format ' . 
+				$format . '!');
+		}
 	}
 
 
 	/**
 	 * Lets you access post and get parameters by the index
+	 * @deprecated write your parameters as method arguments instead
 	 * @param string $key the key which you want to access in the URL Parameter
 	 *                     placeholder, $_POST or $_GET array.
 	 *                     The priority how they're returned is the following:
@@ -79,6 +147,7 @@ abstract class Controller {
 	/**
 	 * Returns all params that were received, be it from the request
 	 * (as GET or POST) or throuh the URL by the route
+	 * @deprecated use $this->request instead
 	 * @return array the array with all parameters
 	 */
 	public function getParams() {
@@ -88,6 +157,7 @@ abstract class Controller {
 
 	/**
 	 * Returns the method of the request
+	 * @deprecated use $this->request instead
 	 * @return string the method of the request (POST, GET, etc)
 	 */
 	public function method() {
@@ -97,6 +167,7 @@ abstract class Controller {
 
 	/**
 	 * Shortcut for accessing an uploaded file through the $_FILES array
+	 * @deprecated use $this->request instead
 	 * @param string $key the key that will be taken from the $_FILES array
 	 * @return array the file in the $_FILES element
 	 */
@@ -107,6 +178,7 @@ abstract class Controller {
 
 	/**
 	 * Shortcut for getting env variables
+	 * @deprecated use $this->request instead
 	 * @param string $key the key that will be taken from the $_ENV array
 	 * @return array the value in the $_ENV element
 	 */
@@ -117,6 +189,7 @@ abstract class Controller {
 
 	/**
 	 * Shortcut for getting cookie variables
+	 * @deprecated use $this->request instead
 	 * @param string $key the key that will be taken from the $_COOKIE array
 	 * @return array the value in the $_COOKIE element
 	 */
@@ -127,6 +200,7 @@ abstract class Controller {
 
 	/**
 	 * Shortcut for rendering a template
+	 * @deprecated return a template response instead
 	 * @param string $templateName the name of the template
 	 * @param array $params the template parameters in key => value structure
 	 * @param string $renderAs user renders a full page, blank only your template
diff --git a/tests/lib/appframework/utility/MethodAnnotationReaderTest.php b/lib/public/appframework/db/doesnotexistexception.php
similarity index 50%
rename from tests/lib/appframework/utility/MethodAnnotationReaderTest.php
rename to lib/public/appframework/db/doesnotexistexception.php
index c68812aa5c..5861e74f6c 100644
--- a/tests/lib/appframework/utility/MethodAnnotationReaderTest.php
+++ b/lib/public/appframework/db/doesnotexistexception.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -22,34 +22,21 @@
  */
 
 
-namespace OC\AppFramework\Utility;
+namespace OCP\AppFramework\Db;
 
 
-class MethodAnnotationReaderTest extends \PHPUnit_Framework_TestCase {
-
+/**
+ * This is returned or should be returned when a find request does not find an
+ * entry in the database
+ */
+class DoesNotExistException extends \Exception {
 
 	/**
-	 * @Annotation
+	 * Constructor
+	 * @param string $msg the error message
 	 */
-	public function testReadAnnotation(){
-		$reader = new MethodAnnotationReader('\OC\AppFramework\Utility\MethodAnnotationReaderTest',
-				'testReadAnnotation');
-
-		$this->assertTrue($reader->hasAnnotation('Annotation'));
+	public function __construct($msg){
+		parent::__construct($msg);
 	}
 
-
-	/**
-	 * @Annotation
-	 * @param test
-	 */
-	public function testReadAnnotationNoLowercase(){
-		$reader = new MethodAnnotationReader('\OC\AppFramework\Utility\MethodAnnotationReaderTest',
-				'testReadAnnotationNoLowercase');
-
-		$this->assertTrue($reader->hasAnnotation('Annotation'));
-		$this->assertFalse($reader->hasAnnotation('param'));
-	}
-
-
-}
+}
\ No newline at end of file
diff --git a/lib/public/appframework/db/entity.php b/lib/public/appframework/db/entity.php
new file mode 100644
index 0000000000..8ab42bd915
--- /dev/null
+++ b/lib/public/appframework/db/entity.php
@@ -0,0 +1,236 @@
+<?php
+
+/**
+* ownCloud - App Framework
+*
+* @author Bernhard Posselt
+* @copyright 2012 Bernhard Posselt dev@bernhard-posselt.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 OCP\AppFramework\Db;
+
+
+/**
+ * @method integer getId()
+ * @method void setId(integer $id)
+ */
+abstract class Entity {
+
+	public $id;
+
+	private $_updatedFields = array();
+	private $_fieldTypes = array('id' => 'integer');
+
+
+	/**
+	 * Simple alternative constructor for building entities from a request
+	 * @param array $params the array which was obtained via $this->params('key')
+	 * in the controller
+	 * @return Entity
+	 */
+	public static function fromParams(array $params) {
+		$instance = new static();
+
+		foreach($params as $key => $value) {
+			$method = 'set' . ucfirst($key);
+			$instance->$method($value);
+		}
+
+		return $instance;
+	}
+
+
+	/**
+	 * Maps the keys of the row array to the attributes
+	 * @param array $row the row to map onto the entity
+	 */
+	public static function fromRow(array $row){
+		$instance = new static();
+
+		foreach($row as $key => $value){
+			$prop = ucfirst($instance->columnToProperty($key));
+			$setter = 'set' . $prop;
+			$instance->$setter($value);
+		}
+
+		$instance->resetUpdatedFields();
+
+		return $instance;
+	}
+
+
+	/**
+	 * @return an array with attribute and type
+	 */
+	public function getFieldTypes() {
+		return $this->_fieldTypes;
+	}
+
+	
+	/**
+	 * Marks the entity as clean needed for setting the id after the insertion
+	 */
+	public function resetUpdatedFields(){
+		$this->_updatedFields = array();
+	}
+
+
+	protected function setter($name, $args) {
+		// setters should only work for existing attributes
+		if(property_exists($this, $name)){
+			if($this->$name === $args[0]) {
+				return;
+			}
+			$this->markFieldUpdated($name);
+
+			// if type definition exists, cast to correct type
+			if($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) {
+				settype($args[0], $this->_fieldTypes[$name]);
+			}
+			$this->$name = $args[0];
+
+		} else {
+			throw new \BadFunctionCallException($name . 
+				' is not a valid attribute');
+		}
+	}
+
+
+	protected function getter($name) {
+		// getters should only work for existing attributes
+		if(property_exists($this, $name)){
+			return $this->$name;
+		} else {
+			throw new \BadFunctionCallException($name . 
+				' is not a valid attribute');
+		}
+	}
+
+
+	/**
+	 * Each time a setter is called, push the part after set
+	 * into an array: for instance setId will save Id in the 
+	 * updated fields array so it can be easily used to create the
+	 * getter method
+	 */
+	public function __call($methodName, $args){
+		$attr = lcfirst( substr($methodName, 3) );
+
+		if(strpos($methodName, 'set') === 0){
+			$this->setter($attr, $args);
+		} elseif(strpos($methodName, 'get') === 0) {
+			return $this->getter($attr);
+		} else {
+			throw new \BadFunctionCallException($methodName . 
+					' does not exist');
+		}
+
+	}
+
+
+	/**
+	 * Mark am attribute as updated
+	 * @param string $attribute the name of the attribute
+	 */
+	protected function markFieldUpdated($attribute){
+		$this->_updatedFields[$attribute] = true;
+	}
+
+
+	/**
+	 * Transform a database columnname to a property 
+	 * @param string $columnName the name of the column
+	 * @return string the property name
+	 */
+	public function columnToProperty($columnName){
+		$parts = explode('_', $columnName);
+		$property = null;
+
+		foreach($parts as $part){
+			if($property === null){
+				$property = $part;
+			} else {
+				$property .= ucfirst($part);
+			}
+		}
+
+		return $property;
+	}
+
+
+	/**
+	 * Transform a property to a database column name
+	 * @param string $property the name of the property
+	 * @return string the column name
+	 */
+	public function propertyToColumn($property){
+		$parts = preg_split('/(?=[A-Z])/', $property);
+		$column = null;
+
+		foreach($parts as $part){
+			if($column === null){
+				$column = $part;
+			} else {
+				$column .= '_' . lcfirst($part);
+			}
+		}
+
+		return $column;
+	}
+
+
+	/**
+	 * @return array array of updated fields for update query
+	 */
+	public function getUpdatedFields(){
+		return $this->_updatedFields;
+	}
+
+
+	/**
+	 * Adds type information for a field so that its automatically casted to
+	 * that value once its being returned from the database
+	 * @param string $fieldName the name of the attribute
+	 * @param string $type the type which will be used to call settype()
+	 */
+	protected function addType($fieldName, $type){
+		$this->_fieldTypes[$fieldName] = $type;
+	}
+
+
+	/**
+	 * Slugify the value of a given attribute
+	 * Warning: This doesn't result in a unique value
+	 * @param string $attributeName the name of the attribute, which value should be slugified
+	 * @return string slugified value
+	 */
+	public function slugify($attributeName){
+		// toSlug should only work for existing attributes
+		if(property_exists($this, $attributeName)){
+			$value = $this->$attributeName;
+			// replace everything except alphanumeric with a single '-'
+			$value = preg_replace('/[^A-Za-z0-9]+/', '-', $value);
+			$value = strtolower($value);
+			// trim '-'
+			return trim($value, '-');
+		} else {
+			throw new \BadFunctionCallException($attributeName .
+				' is not a valid attribute');
+		}
+	}
+
+}
diff --git a/lib/public/appframework/db/mapper.php b/lib/public/appframework/db/mapper.php
new file mode 100644
index 0000000000..a23149e796
--- /dev/null
+++ b/lib/public/appframework/db/mapper.php
@@ -0,0 +1,291 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @author Morris Jobke
+ * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com
+ * @copyright 2013 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/>.
+ *
+ */
+
+
+namespace OCP\AppFramework\Db;
+
+use \OCP\IDb;
+
+
+/**
+ * Simple parent class for inheriting your data access layer from. This class
+ * may be subject to change in the future
+ */
+abstract class Mapper {
+
+	protected $tableName;
+	protected $entityClass;
+	protected $db;
+
+	/**
+	 * @param IDb $db Instance of the Db abstraction layer
+	 * @param string $tableName the name of the table. set this to allow entity 
+	 * @param string $entityClass the name of the entity that the sql should be
+	 * mapped to queries without using sql
+	 */
+	public function __construct(IDb $db, $tableName, $entityClass=null){
+		$this->db = $db;
+		$this->tableName = '*PREFIX*' . $tableName;
+
+		// if not given set the entity name to the class without the mapper part
+		// cache it here for later use since reflection is slow
+		if($entityClass === null) {
+			$this->entityClass = str_replace('Mapper', '', get_class($this));
+		} else {
+			$this->entityClass = $entityClass;
+		}
+	}
+
+
+	/**
+	 * @return string the table name
+	 */
+	public function getTableName(){
+		return $this->tableName;
+	}
+
+
+	/**
+	 * Deletes an entity from the table
+	 * @param Entity $entity the entity that should be deleted
+	 */
+	public function delete(Entity $entity){
+		$sql = 'DELETE FROM `' . $this->tableName . '` WHERE `id` = ?';
+		$this->execute($sql, array($entity->getId()));
+	}
+
+
+	/**
+	 * Creates a new entry in the db from an entity
+	 * @param Entity $entity the entity that should be created
+	 * @return Entity the saved entity with the set id
+	 */
+	public function insert(Entity $entity){
+		// get updated fields to save, fields have to be set using a setter to
+		// be saved
+		$properties = $entity->getUpdatedFields();
+		$values = '';
+		$columns = '';
+		$params = array();
+
+		// build the fields
+		$i = 0;
+		foreach($properties as $property => $updated) {
+			$column = $entity->propertyToColumn($property);
+			$getter = 'get' . ucfirst($property);
+			
+			$columns .= '`' . $column . '`';
+			$values .= '?';
+
+			// only append colon if there are more entries
+			if($i < count($properties)-1){
+				$columns .= ',';
+				$values .= ',';
+			}
+
+			array_push($params, $entity->$getter());
+			$i++;
+
+		}
+
+		$sql = 'INSERT INTO `' . $this->tableName . '`(' .
+				$columns . ') VALUES(' . $values . ')';
+		
+		$this->execute($sql, $params);
+
+		$entity->setId((int) $this->db->getInsertId($this->tableName));
+		return $entity;
+	}
+
+
+
+	/**
+	 * Updates an entry in the db from an entity
+	 * @throws \InvalidArgumentException if entity has no id
+	 * @param Entity $entity the entity that should be created
+	 */
+	public function update(Entity $entity){
+		// if entity wasn't changed it makes no sense to run a db query
+		$properties = $entity->getUpdatedFields();
+		if(count($properties) === 0) {
+			return $entity;
+		}
+
+		// entity needs an id
+		$id = $entity->getId();
+		if($id === null){
+			throw new \InvalidArgumentException(
+				'Entity which should be updated has no id');
+		}
+
+		// get updated fields to save, fields have to be set using a setter to
+		// be saved
+		// dont update the id field
+		unset($properties['id']);
+
+		$columns = '';
+		$params = array();
+
+		// build the fields
+		$i = 0;
+		foreach($properties as $property => $updated) {
+
+			$column = $entity->propertyToColumn($property);
+			$getter = 'get' . ucfirst($property);
+			
+			$columns .= '`' . $column . '` = ?';
+
+			// only append colon if there are more entries
+			if($i < count($properties)-1){
+				$columns .= ',';
+			}
+
+			array_push($params, $entity->$getter());
+			$i++;
+		}
+
+		$sql = 'UPDATE `' . $this->tableName . '` SET ' . 
+				$columns . ' WHERE `id` = ?';
+		array_push($params, $id);
+
+		$this->execute($sql, $params);
+	}
+
+
+	/**
+	 * Runs an sql query
+	 * @param string $sql the prepare string
+	 * @param array $params the params which should replace the ? in the sql query
+	 * @param int $limit the maximum number of rows
+	 * @param int $offset from which row we want to start
+	 * @return \PDOStatement the database query result
+	 */
+	protected function execute($sql, array $params=array(), $limit=null, $offset=null){
+		$query = $this->db->prepareQuery($sql, $limit, $offset);
+
+		$index = 1;  // bindParam is 1 indexed
+		foreach($params as $param) {
+
+			switch (gettype($param)) {
+				case 'integer':
+					$pdoConstant = \PDO::PARAM_INT;
+					break;
+
+				case 'boolean':
+					$pdoConstant = \PDO::PARAM_BOOL;
+					break;
+				
+				default:
+					$pdoConstant = \PDO::PARAM_STR;
+					break;
+			}
+			
+			$query->bindValue($index, $param, $pdoConstant);
+
+			$index++;
+		}
+
+		return $query->execute();
+	}
+
+
+	/**
+	 * Returns an db result and throws exceptions when there are more or less
+	 * results
+	 * @see findEntity
+	 * @param string $sql the sql query
+	 * @param array $params the parameters of the sql query
+	 * @param int $limit the maximum number of rows
+	 * @param int $offset from which row we want to start
+	 * @throws DoesNotExistException if the item does not exist
+	 * @throws MultipleObjectsReturnedException if more than one item exist
+	 * @return array the result as row
+	 */
+	protected function findOneQuery($sql, array $params=array(), $limit=null, $offset=null){
+		$result = $this->execute($sql, $params, $limit, $offset);
+		$row = $result->fetch();
+
+		if($row === false || $row === null){
+			throw new DoesNotExistException('No matching entry found');
+		}
+		$row2 = $result->fetch();
+		//MDB2 returns null, PDO and doctrine false when no row is available
+		if( ! ($row2 === false || $row2 === null )) {
+			throw new MultipleObjectsReturnedException('More than one result');
+		} else {
+			return $row;
+		}
+	}
+
+
+	/**
+	 * Creates an entity from a row. Automatically determines the entity class
+	 * from the current mapper name (MyEntityMapper -> MyEntity)
+	 * @param array $row the row which should be converted to an entity
+	 * @return Entity the entity
+	 */
+	protected function mapRowToEntity($row) {
+		return call_user_func($this->entityClass .'::fromRow', $row);
+	}
+
+
+	/**
+	 * Runs a sql query and returns an array of entities
+	 * @param string $sql the prepare string
+	 * @param array $params the params which should replace the ? in the sql query
+	 * @param int $limit the maximum number of rows
+	 * @param int $offset from which row we want to start
+	 * @return array all fetched entities
+	 */
+	protected function findEntities($sql, array $params=array(), $limit=null, $offset=null) {
+		$result = $this->execute($sql, $params, $limit, $offset);
+
+		$entities = array();
+		
+		while($row = $result->fetch()){
+			$entities[] = $this->mapRowToEntity($row);
+		}
+
+		return $entities;
+	}
+
+
+	/**
+	 * Returns an db result and throws exceptions when there are more or less
+	 * results
+	 * @param string $sql the sql query
+	 * @param array $params the parameters of the sql query
+	 * @param int $limit the maximum number of rows
+	 * @param int $offset from which row we want to start
+	 * @throws DoesNotExistException if the item does not exist
+	 * @throws MultipleObjectsReturnedException if more than one item exist
+	 * @return Entity the entity
+	 */
+	protected function findEntity($sql, array $params=array(), $limit=null, $offset=null){
+		return $this->mapRowToEntity($this->findOneQuery($sql, $params, $limit, $offset));
+	}
+
+
+}
diff --git a/lib/public/appframework/db/multipleobjectsreturnedexception.php b/lib/public/appframework/db/multipleobjectsreturnedexception.php
new file mode 100644
index 0000000000..51d8d6bc7e
--- /dev/null
+++ b/lib/public/appframework/db/multipleobjectsreturnedexception.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.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 OCP\AppFramework\Db;
+
+
+/**
+ * This is returned or should be returned when a find request finds more than one
+ * row
+ */
+class MultipleObjectsReturnedException extends \Exception {
+
+	/**
+	 * Constructor
+	 * @param string $msg the error message
+	 */
+	public function __construct($msg){
+		parent::__construct($msg);
+	}
+
+}
\ No newline at end of file
diff --git a/lib/public/appframework/http.php b/lib/public/appframework/http.php
index 60f314202c..c6e2ff8846 100644
--- a/lib/public/appframework/http.php
+++ b/lib/public/appframework/http.php
@@ -3,7 +3,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/appframework/http/downloadresponse.php b/lib/public/appframework/http/downloadresponse.php
index d3c2818e82..6b61490341 100644
--- a/lib/public/appframework/http/downloadresponse.php
+++ b/lib/public/appframework/http/downloadresponse.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/appframework/http/iresponseserializer.php b/lib/public/appframework/http/iresponseserializer.php
new file mode 100644
index 0000000000..c16e106df3
--- /dev/null
+++ b/lib/public/appframework/http/iresponseserializer.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.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 OCP\AppFramework\Http;
+
+interface IResponseSerializer {
+    function serialize($response);
+}
\ No newline at end of file
diff --git a/lib/public/appframework/http/jsonresponse.php b/lib/public/appframework/http/jsonresponse.php
index 6d029b7464..c6360e0a0f 100644
--- a/lib/public/appframework/http/jsonresponse.php
+++ b/lib/public/appframework/http/jsonresponse.php
@@ -3,7 +3,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/appframework/http/redirectresponse.php b/lib/public/appframework/http/redirectresponse.php
index 416e153363..a1b482c6b3 100644
--- a/lib/public/appframework/http/redirectresponse.php
+++ b/lib/public/appframework/http/redirectresponse.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/appframework/http/response.php b/lib/public/appframework/http/response.php
index 45402d9b3b..20e936bb86 100644
--- a/lib/public/appframework/http/response.php
+++ b/lib/public/appframework/http/response.php
@@ -3,7 +3,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -92,6 +92,10 @@ class Response {
 	 * @return Response Reference to this object
 	 */
 	public function addHeader($name, $value) {
+		$name = trim($name);  // always remove leading and trailing whitespace
+		                      // to be able to reliably check for security 
+		                      // headers
+
 		if(is_null($value)) {
 			unset($this->headers[$name]);
 		} else {
diff --git a/lib/public/appframework/http/templateresponse.php b/lib/public/appframework/http/templateresponse.php
index f5baf788ad..02589f4e2a 100644
--- a/lib/public/appframework/http/templateresponse.php
+++ b/lib/public/appframework/http/templateresponse.php
@@ -3,7 +3,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -61,12 +61,16 @@ class TemplateResponse extends Response {
 	 * constructor of TemplateResponse
 	 * @param string $appName the name of the app to load the template from
 	 * @param string $templateName the name of the template
+	 * @param array $params an array of parameters which should be passed to the
+	 * template
+	 * @param string $renderAs how the page should be rendered, defaults to user
 	 */
-	public function __construct($appName, $templateName) {
+	public function __construct($appName, $templateName, array $params=array(),
+	                            $renderAs='user') {
 		$this->templateName = $templateName;
 		$this->appName = $appName;
-		$this->params = array();
-		$this->renderAs = 'user';
+		$this->params = $params;
+		$this->renderAs = $renderAs;
 	}
 
 
diff --git a/lib/public/appframework/iapi.php b/lib/public/appframework/iapi.php
index c4aeea2d4e..9af251be85 100644
--- a/lib/public/appframework/iapi.php
+++ b/lib/public/appframework/iapi.php
@@ -3,7 +3,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/appframework/middleware.php b/lib/public/appframework/middleware.php
index 24f3193993..2e1111e9d5 100644
--- a/lib/public/appframework/middleware.php
+++ b/lib/public/appframework/middleware.php
@@ -3,7 +3,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php
index 03b94403b4..562228e1e5 100644
--- a/lib/public/backgroundjob.php
+++ b/lib/public/backgroundjob.php
@@ -94,7 +94,7 @@ class BackgroundJob {
 	/**
 	 * @deprecated
 	 * gets all regular tasks
-	 * @return associative array
+	 * @return array
 	 *
 	 * key is string "$klass-$method", value is array( $klass, $method )
 	 */
@@ -115,7 +115,7 @@ class BackgroundJob {
 	 * @deprecated
 	 * Gets one queued task
 	 * @param int $id ID of the task
-	 * @return BackgroundJob\IJob array
+	 * @return BackgroundJob\IJob|null
 	 */
 	public static function findQueuedTask($id) {
 		$jobList = \OC::$server->getJobList();
@@ -125,7 +125,7 @@ class BackgroundJob {
 	/**
 	 * @deprecated
 	 * Gets all queued tasks
-	 * @return array with associative arrays
+	 * @return array an array of associative arrays
 	 */
 	public static function allQueuedTasks() {
 		$jobList = \OC::$server->getJobList();
@@ -145,7 +145,7 @@ class BackgroundJob {
 	 * @deprecated
 	 * Gets all queued tasks of a specific app
 	 * @param string $app app name
-	 * @return array with associative arrays
+	 * @return array an array of associative arrays
 	 */
 	public static function queuedTaskWhereAppIs($app) {
 		$jobList = \OC::$server->getJobList();
diff --git a/lib/public/backgroundjob/ijoblist.php b/lib/public/backgroundjob/ijoblist.php
index c9b546605b..366b0e3736 100644
--- a/lib/public/backgroundjob/ijoblist.php
+++ b/lib/public/backgroundjob/ijoblist.php
@@ -12,7 +12,7 @@ interface IJobList {
 	/**
 	 * Add a job to the list
 	 *
-	 * @param \OCP\BackgroundJob\IJob |string $job
+	 * @param \OCP\BackgroundJob\IJob|string $job
 	 * @param mixed $argument The argument to be passed to $job->run() when the job is exectured
 	 * @param string $job
 	 * @return void
@@ -22,7 +22,7 @@ interface IJobList {
 	/**
 	 * Remove a job from the list
 	 *
-	 * @param IJob $job
+	 * @param \OCP\BackgroundJob\IJob|string $job
 	 * @param mixed $argument
 	 * @return void
 	 */
@@ -31,7 +31,7 @@ interface IJobList {
 	/**
 	 * check if a job is in the list
 	 *
-	 * @param $job
+	 * @param \OCP\BackgroundJob\IJob|string $job
 	 * @param mixed $argument
 	 * @return bool
 	 */
diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index 1b61d7aa4f..fb88c13bd1 100644
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -87,7 +87,7 @@ namespace OCP {
 		 * @param string $pattern which should match within the $searchProperties
 		 * @param array $searchProperties defines the properties within the query pattern should match
 		 * @param array $options - for future use. One should always have options!
-		 * @return array of contacts which are arrays of key-value-pairs
+		 * @return array an array of contacts which are arrays of key-value-pairs
 		 */
 		public static function search($pattern, $searchProperties = array(), $options = array()) {
 			$cm = \OC::$server->getContactsManager();
@@ -98,7 +98,7 @@ namespace OCP {
 		 * 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
 		 * @return bool successful or not
 		 */
 		public static function delete($id, $address_book_key) {
@@ -111,12 +111,12 @@ namespace OCP {
 		 * 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
-		 * @return array representing the contact just created or updated
+		 * @param string $address_book_key identifier of the address book in which the contact shall be created or updated
+		 * @return array an array representing the contact just created or updated
 		 */
 		public static function createOrUpdate($properties, $address_book_key) {
 			$cm = \OC::$server->getContactsManager();
-			return $cm->search($properties, $address_book_key);
+			return $cm->createOrUpdate($properties, $address_book_key);
 		}
 
 		/**
diff --git a/lib/public/contacts/imanager.php b/lib/public/contacts/imanager.php
index 1387836573..5a76585ead 100644
--- a/lib/public/contacts/imanager.php
+++ b/lib/public/contacts/imanager.php
@@ -88,7 +88,7 @@ namespace OCP\Contacts {
 		 * @param string $pattern which should match within the $searchProperties
 		 * @param array $searchProperties defines the properties within the query pattern should match
 		 * @param array $options - for future use. One should always have options!
-		 * @return array of contacts which are arrays of key-value-pairs
+		 * @return array an array of contacts which are arrays of key-value-pairs
 		 */
 		function search($pattern, $searchProperties = array(), $options = array());
 
@@ -107,7 +107,7 @@ namespace OCP\Contacts {
 		 *
 		 * @param array $properties this array if key-value-pairs defines a contact
 		 * @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
+		 * @return array an array representing the contact just created or updated
 		 */
 		function createOrUpdate($properties, $address_book_key);
 
diff --git a/lib/public/db.php b/lib/public/db.php
index cb876b4d1f..ba3a4724ce 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -50,7 +50,7 @@ class DB {
 	/**
 	 * Insert a row if a matching row doesn't exists.
 	 * @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix
-	 * @param $input array
+	 * @param array $input
 	 *
 	 * The input array if in the form:
 	 *
diff --git a/lib/public/files/fileinfo.php b/lib/public/files/fileinfo.php
index 37162e0933..b9c8258f21 100644
--- a/lib/public/files/fileinfo.php
+++ b/lib/public/files/fileinfo.php
@@ -104,7 +104,7 @@ interface FileInfo {
 	/**
 	 * Check whether this is a file or a folder
 	 *
-	 * @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER
+	 * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
 	 */
 	public function getType();
 
@@ -135,4 +135,18 @@ interface FileInfo {
 	 * @return bool
 	 */
 	public function isShareable();
+
+	/**
+	 * Check if a file or folder is shared
+	 *
+	 * @return bool
+	 */
+	public function isShared();
+
+	/**
+	 * Check if a file or folder is mounted
+	 *
+	 * @return bool
+	 */
+	public function isMounted();
 }
diff --git a/lib/public/iaddressbook.php b/lib/public/iaddressbook.php
index dcfe08012e..70309e8c57 100644
--- a/lib/public/iaddressbook.php
+++ b/lib/public/iaddressbook.php
@@ -45,7 +45,7 @@ namespace OCP {
 		 * @param string $pattern which should match within the $searchProperties
 		 * @param array $searchProperties defines the properties within the query pattern should match
 		 * @param array $options - for future use. One should always have options!
-		 * @return array of contacts which are arrays of key-value-pairs
+		 * @return array an array of contacts which are arrays of key-value-pairs
 		 */
 		public function search($pattern, $searchProperties, $options);
 		//	// dummy results
@@ -56,7 +56,7 @@ namespace OCP {
 
 		/**
 		 * @param array $properties this array if key-value-pairs defines a contact
-		 * @return array representing the contact just created or updated
+		 * @return array an array representing the contact just created or updated
 		 */
 		public function createOrUpdate($properties);
 		//	// dummy
diff --git a/lib/public/iappconfig.php b/lib/public/iappconfig.php
index 2b014df2e4..d43eb70ee0 100644
--- a/lib/public/iappconfig.php
+++ b/lib/public/iappconfig.php
@@ -13,7 +13,7 @@ namespace OCP;
  */
 interface IAppConfig {
 	/**
-	 * @brief check if a key is set in the appconfig
+	 * check if a key is set in the appconfig
 	 * @param string $app
 	 * @param string $key
 	 * @return bool
@@ -21,7 +21,7 @@ interface IAppConfig {
 	public function hasKey($app, $key);
 
 	/**
-	 * @brief Gets the config value
+	 * Gets the config value
 	 * @param string $app app
 	 * @param string $key key
 	 * @param string $default = null, default value if the key does not exist
@@ -33,7 +33,7 @@ interface IAppConfig {
 	public function getValue($app, $key, $default = null);
 
 	/**
-	 * @brief Deletes a key
+	 * Deletes a key
 	 * @param string $app app
 	 * @param string $key key
 	 * @return bool
@@ -43,9 +43,9 @@ interface IAppConfig {
 	public function deleteKey($app, $key);
 
 	/**
-	 * @brief Get the available keys for an app
+	 * Get the available keys for an app
 	 * @param string $app the app we are looking for
-	 * @return array with key names
+	 * @return array an array of key names
 	 *
 	 * This function gets all keys of an app. Please note that the values are
 	 * not returned.
@@ -62,7 +62,7 @@ interface IAppConfig {
 	public function getValues($app, $key);
 
 	/**
-	 * @brief sets a value in the appconfig
+	 * sets a value in the appconfig
 	 * @param string $app app
 	 * @param string $key key
 	 * @param string $value value
@@ -73,8 +73,8 @@ interface IAppConfig {
 	public function setValue($app, $key, $value);
 
 	/**
-	 * @brief Get all apps using the config
-	 * @return array with app ids
+	 * Get all apps using the config
+	 * @return array an array of app ids
 	 *
 	 * This function returns a list of all apps that have at least one
 	 * entry in the appconfig table.
@@ -82,7 +82,7 @@ interface IAppConfig {
 	public function getApps();
 
 	/**
-	 * @brief Remove app from appconfig
+	 * Remove app from appconfig
 	 * @param string $app app
 	 * @return bool
 	 *
diff --git a/lib/public/iavatar.php b/lib/public/iavatar.php
index 43fa32556d..1e80682c4f 100644
--- a/lib/public/iavatar.php
+++ b/lib/public/iavatar.php
@@ -14,14 +14,14 @@ namespace OCP;
 interface IAvatar {
 
 	/**
-	 * @brief get the users avatar
-	 * @param $size integer size in px of the avatar, avatars are square, defaults to 64
+	 * get the users avatar
+	 * @param int $size size in px of the avatar, avatars are square, defaults to 64
 	 * @return boolean|\OC_Image containing the avatar or false if there's no image
 	 */
 	function get($size = 64);
 
 	/**
-	 * @brief sets the users avatar
+	 * sets the users avatar
 	 * @param Image $data mixed imagedata or path to set a new avatar
 	 * @throws Exception if the provided file is not a jpg or png image
 	 * @throws Exception if the provided image is not valid
@@ -31,7 +31,7 @@ interface IAvatar {
 	function set($data);
 
 	/**
-	 * @brief remove the users avatar
+	 * remove the users avatar
 	 * @return void
 	 */
 	function remove();
diff --git a/lib/public/iavatarmanager.php b/lib/public/iavatarmanager.php
index 9b185ae046..1fd8940598 100644
--- a/lib/public/iavatarmanager.php
+++ b/lib/public/iavatarmanager.php
@@ -14,9 +14,9 @@ namespace OCP;
 interface IAvatarManager {
 
 	/**
-	 * @brief return a user specific instance of \OCP\IAvatar
+	 * return a user specific instance of \OCP\IAvatar
 	 * @see \OCP\IAvatar
-	 * @param $user string the ownCloud user id
+	 * @param string $user the ownCloud user id
 	 * @return \OCP\IAvatar
 	 */
 	function getAvatar($user);
diff --git a/lib/public/idb.php b/lib/public/idb.php
new file mode 100644
index 0000000000..82a8a68150
--- /dev/null
+++ b/lib/public/idb.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.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 OCP;
+
+
+/**
+ * Small Facade for being able to inject the database connection for tests
+ */
+interface IDb {
+
+
+    /**
+     * Used to abstract the owncloud database access away
+     * @param string $sql the sql query with ? placeholder for params
+     * @param int $limit the maximum number of rows
+     * @param int $offset from which row we want to start
+     * @return \OC_DB_StatementWrapper prepared SQL query
+     */
+    public function prepareQuery($sql, $limit=null, $offset=null);
+
+
+    /**
+     * Used to get the id of the just inserted element
+     * @param string $tableName the name of the table where we inserted the item
+     * @return int the id of the inserted element
+     */
+    public function getInsertId($tableName);
+
+
+}
diff --git a/lib/public/idbconnection.php b/lib/public/idbconnection.php
index 656b5e7e5b..3e6624e07e 100644
--- a/lib/public/idbconnection.php
+++ b/lib/public/idbconnection.php
@@ -52,8 +52,8 @@ interface IDBConnection {
 
 	/**
 	 * Insert a row if a matching row doesn't exists.
-	 * @param string The table name (will replace *PREFIX*) to perform the replace on.
-	 * @param array
+	 * @param string $table The table name (will replace *PREFIX*) to perform the replace on.
+	 * @param array $input
 	 *
 	 * The input array if in the form:
 	 *
diff --git a/lib/public/il10n.php b/lib/public/il10n.php
index 1388274c21..2c95ddfec1 100644
--- a/lib/public/il10n.php
+++ b/lib/public/il10n.php
@@ -53,7 +53,7 @@ interface IL10N {
 	 * Localization
 	 * @param string $type Type of localization
 	 * @param array $data parameters for this localization
-	 * @return String or false
+	 * @return string|false
 	 *
 	 * Returns the localized data.
 	 *
@@ -72,4 +72,18 @@ interface IL10N {
 	 *    - params: timestamp (int/string)
 	 */
 	public function l($type, $data);
+
+
+	/**
+	 * find the best language
+	 * @param array|string $app details below
+	 * @return string language
+	 *
+	 * If $app is an array, ownCloud assumes that these are the available
+	 * languages. Otherwise ownCloud tries to find the files in the l10n
+	 * folder.
+	 *
+	 * If nothing works it returns 'en'
+	 */
+	public function getLanguageCode($app=null);
 }
diff --git a/lib/public/ilogger.php b/lib/public/ilogger.php
new file mode 100644
index 0000000000..ad0fcd05a1
--- /dev/null
+++ b/lib/public/ilogger.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright (c) 2014 Bernhard Posselt <dev@bernhard-posselt.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP;
+
+/**
+ * Interface ILogger
+ * @package OCP
+ *
+ * This logger interface follows the design guidelines of PSR-3
+ * https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#3-psrlogloggerinterface
+ */
+interface ILogger {
+	/**
+	 * System is unusable.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	function emergency($message, array $context = array());
+
+	/**
+	 * Action must be taken immediately.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	function alert($message, array $context = array());
+
+	/**
+	 * Critical conditions.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	function critical($message, array $context = array());
+
+	/**
+	 * Runtime errors that do not require immediate action but should typically
+	 * be logged and monitored.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	function error($message, array $context = array());
+
+	/**
+	 * Exceptional occurrences that are not errors.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	function warning($message, array $context = array());
+
+	/**
+	 * Normal but significant events.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	function notice($message, array $context = array());
+
+	/**
+	 * Interesting events.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	function info($message, array $context = array());
+
+	/**
+	 * Detailed debug information.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	function debug($message, array $context = array());
+
+	/**
+	 * Logs with an arbitrary level.
+	 *
+	 * @param mixed $level
+	 * @param string $message
+	 * @param array $context
+	 * @return mixed
+	 */
+	function log($level, $message, array $context = array());
+}
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 600d81d83a..22176c36b8 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -113,6 +113,14 @@ interface IServerContainer {
 	 */
 	function getConfig();
 
+
+	/**
+	 * Returns an instance of the db facade
+	 * @return \OCP\IDb
+	 */
+	function getDb();
+
+
 	/**
 	 * Returns the app config manager
 	 *
diff --git a/lib/public/itags.php b/lib/public/itags.php
index f8ebaa668f..1cba07e9b5 100644
--- a/lib/public/itags.php
+++ b/lib/public/itags.php
@@ -62,7 +62,7 @@ interface ITags {
 	* 	['id' => 1, 'name' = 'Second tag'],
 	* ]
 	*
-	* @returns array
+	* @return array
 	*/
 	public function getTags();
 
diff --git a/lib/public/route/iroute.php b/lib/public/route/iroute.php
index d5610e762a..f511e7af72 100644
--- a/lib/public/route/iroute.php
+++ b/lib/public/route/iroute.php
@@ -26,7 +26,7 @@ interface IRoute {
 	 * The action to execute when this route matches, includes a file like
 	 * it is called directly
 	 *
-	 * @param $file
+	 * @param string $file
 	 * @return void
 	 */
 	public function actionInclude($file);
diff --git a/lib/public/share.php b/lib/public/share.php
index 230a517b5e..8566a38c61 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -41,11 +41,11 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType Item type
+	 * @param string $class Backend class
+	 * @param string $collectionOf (optional) Depends on item type
+	 * @param array $supportedFileExtensions (optional) List of supported file extensions if this item type depends on files
+	 * @return boolean true if backend is registered or false if error
 	 */
 	public static function registerBackend($itemType, $class, $collectionOf = null, $supportedFileExtensions = null) {
 		return \OC\Share\Share::registerBackend($itemType, $class, $collectionOf, $supportedFileExtensions);
@@ -53,7 +53,7 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * Check if the Share API is enabled
-	 * @return Returns true if enabled or false
+	 * @return boolean true if enabled or false
 	 *
 	 * The Share API is enabled by default if not configured
 	 */
@@ -77,12 +77,12 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType
+	 * @param int $format (optional) Format type must be defined by the backend
+	 * @param mixed $parameters (optional)
+	 * @param int $limit Number of items to return (optional) Returns all by default
+	 * @param bool $includeCollections (optional)
+	 * @return mixed Return depends on format
 	 */
 	public static function getItemsSharedWith($itemType, $format = self::FORMAT_NONE,
 		$parameters = null, $limit = -1, $includeCollections = false) {
@@ -92,13 +92,13 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * Get the items of item type shared with a user
-	 * @param string Item type
-	 * @param sting user id for which user we want the shares
-	 * @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
+	 * @param string $itemType
+	 * @param string $user for which user we want the shares
+	 * @param int $format (optional) Format type must be defined by the backend
+	 * @param mixed $parameters (optional)
+	 * @param int $limit Number of items to return (optional) Returns all by default
+	 * @param bool $includeCollections (optional)
+	 * @return mixed Return depends on format
 	 */
 	public static function getItemsSharedWithUser($itemType, $user, $format = self::FORMAT_NONE,
 		$parameters = null, $limit = -1, $includeCollections = false) {
@@ -111,9 +111,9 @@ class Share extends \OC\Share\Constants {
 	 * @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
+	 * @param mixed $parameters (optional)
+	 * @param bool $includeCollections (optional)
+	 * @return mixed Return depends on format
 	 */
 	public static function getItemSharedWith($itemType, $itemTarget, $format = self::FORMAT_NONE,
 		$parameters = null, $includeCollections = false) {
@@ -134,12 +134,12 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @param int $format (optional) Format type must be defined by the backend
+	 * @param mixed $parameters
+	 * @param bool $includeCollections
+	 * @return mixed Return depends on format
 	 */
 	public static function getItemSharedWithBySource($itemType, $itemSource, $format = self::FORMAT_NONE,
 		$parameters = null, $includeCollections = false) {
@@ -148,9 +148,9 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * Get the item of item type shared by a link
-	 * @param string Item type
-	 * @param string Item source
-	 * @param string Owner of link
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @param string $uidOwner Owner of link
 	 * @return Item
 	 */
 	public static function getItemSharedWithByLink($itemType, $itemSource, $uidOwner) {
@@ -160,7 +160,7 @@ class Share extends \OC\Share\Constants {
 	/**
 	 * 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
+	 * @return array|bool false will be returned in case the token is unknown or unauthorized
 	 */
 	public static function getShareByToken($token, $checkPasswordProtection = true) {
 		return \OC\Share\Share::getShareByToken($token, $checkPasswordProtection);
@@ -168,8 +168,8 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * resolves reshares down to the last real share
-	 * @param $linkItem
-	 * @return $fileOwner
+	 * @param array $linkItem
+	 * @return array file owner
 	 */
 	public static function resolveReShare($linkItem) {
 		return \OC\Share\Share::resolveReShare($linkItem);
@@ -178,12 +178,12 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType
+	 * @param int $format (optional) Format type must be defined by the backend
+	 * @param mixed $parameters
+	 * @param int $limit Number of items to return (optional) Returns all by default
+	 * @param bool $includeCollections
+	 * @return mixed Return depends on format
 	 */
 	public static function getItemsShared($itemType, $format = self::FORMAT_NONE, $parameters = null,
 		$limit = -1, $includeCollections = false) {
@@ -193,12 +193,12 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @param int $format (optional) Format type must be defined by the backend
+	 * @param mixed $parameters
+	 * @param bool $includeCollections
+	 * @return mixed Return depends on format
 	 */
 	public static function getItemShared($itemType, $itemSource, $format = self::FORMAT_NONE,
 	                                     $parameters = null, $includeCollections = false) {
@@ -208,12 +208,12 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @param string $uidOwner
+	 * @param bool $includeCollections
+	 * @param bool $checkExpireDate
+	 * @return array Return array of users
 	 */
 	public static function getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections = false, $checkExpireDate = true) {
 		return \OC\Share\Share::getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections, $checkExpireDate);
@@ -226,26 +226,22 @@ class Share extends \OC\Share\Constants {
 	 * @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
+	 * @param string $itemSourceName
+	 * @param \DateTime $expirationDate
 	 * @return bool|string Returns true on success or false on failure, Returns token on success for links
+	 * @throws \Exception
 	 */
-	public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName = null) {
-		return \OC\Share\Share::shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName);
+	public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName = null, \DateTime $expirationDate = null) {
+		return \OC\Share\Share::shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName, $expirationDate);
 	}
 
 	/**
 	 * 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
+	 * @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
+	 * @return boolean true on success or false on failure
 	 */
 	public static function unshare($itemType, $itemSource, $shareType, $shareWith) {
 		return \OC\Share\Share::unshare($itemType, $itemSource, $shareType, $shareWith);
@@ -253,9 +249,9 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @return boolean true on success or false on failure
 	 */
 	public static function unshareAll($itemType, $itemSource) {
 		return \OC\Share\Share::unshareAll($itemType, $itemSource);
@@ -263,15 +259,16 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @param string $itemType
+	 * @param string $itemTarget
+	 * @return boolean true on success or false on failure
 	 *
 	 * Unsharing from self is not allowed for items inside collections
 	 */
 	public static function unshareFromSelf($itemType, $itemTarget) {
 		return \OC\Share\Share::unshareFromSelf($itemType, $itemTarget);
 	}
+
 	/**
 	 * sent status if users got informed by mail about share
 	 * @param string $itemType
@@ -285,12 +282,12 @@ class Share extends \OC\Share\Constants {
 
 	/**
 	 * 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
+	 * @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 permissions
+	 * @return boolean true on success or false on failure
 	 */
 	public static function setPermissions($itemType, $itemSource, $shareType, $shareWith, $permissions) {
 		return \OC\Share\Share::setPermissions($itemType, $itemSource, $shareType, $shareWith, $permissions);
@@ -301,7 +298,7 @@ class Share extends \OC\Share\Constants {
 	 * @param string $itemType
 	 * @param string $itemSource
 	 * @param string $date expiration date
-	 * @return Share_Backend
+	 * @return boolean
 	 */
 	public static function setExpirationDate($itemType, $itemSource, $date) {
 		return \OC\Share\Share::setExpirationDate($itemType, $itemSource, $date);
@@ -340,23 +337,20 @@ class Share extends \OC\Share\Constants {
 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
-	 * @return mixed|array|false Source
+	 * Check if this $itemSource exist for the user
+	 * @param string $itemSource
+	 * @param string $uidOwner Owner of the item
+	 * @return boolean|null 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
-	 *
-	 * The formatItems() function will translate the source returned back into the item
 	 */
 	public function isValidSource($itemSource, $uidOwner);
 
 	/**
 	 * Get a unique name of the item for the specified user
-	 * @param string Item source
-	 * @param string|false User the item is being shared with
-	 * @param array|null List of similar item names already existing as shared items
+	 * @param string $itemSource
+	 * @param string|false $shareWith User the item is being shared with
+	 * @param array|null $exclude List of similar item names already existing as shared items
 	 * @return string Target name
 	 *
 	 * This function needs to verify that the user does not already have an item with this name.
@@ -366,8 +360,8 @@ interface Share_Backend {
 
 	/**
 	 * Converts the shared item sources back into the item in the specified format
-	 * @param array Shared items
-	 * @param int Format
+	 * @param array $items Shared items
+	 * @param int $format
 	 * @return TODO
 	 *
 	 * The items array is a 3-dimensional array with the item_source as the
@@ -397,8 +391,9 @@ 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 User that is the owner of shared item
+	 * @return string|false
 	 */
 	public function getFilePath($itemSource, $uidOwner);
 
@@ -412,7 +407,7 @@ interface Share_Backend_Collection extends Share_Backend {
 
 	/**
 	 * Get the sources of the children of the item
-	 * @param string Item source
+	 * @param string $itemSource
 	 * @return array Returns an array of children each inside an array with the keys: source, target, and file_path if applicable
 	 */
 	public function getChildren($itemSource);
diff --git a/lib/public/template.php b/lib/public/template.php
index 6cc984b12d..b1264e0c3a 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -33,8 +33,8 @@ namespace OCP;
 
 /**
  * Make OC_Helper::imagePath available as a simple function
- * @param string app
- * @param string image
+ * @param string $app
+ * @param string $image
  * @return string to the image
  *
  * @see OC_Helper::imagePath
@@ -46,7 +46,7 @@ function image_path( $app, $image ) {
 
 /**
  * Make OC_Helper::mimetypeIcon available as a simple function
- * @param string mimetype
+ * @param string $mimetype
  * @return string to the image of this file type.
  */
 function mimetype_icon( $mimetype ) {
@@ -55,7 +55,7 @@ function mimetype_icon( $mimetype ) {
 
 /**
  * Make preview_icon available as a simple function
- * @param string path of file
+ * @param string $path path to file
  * @return string to the preview of the image
  */
 function preview_icon( $path ) {
@@ -76,7 +76,7 @@ function publicPreview_icon ( $path, $token ) {
 /**
  * Make OC_Helper::humanFileSize available as a simple function
  * Example: 2048 to 2 kB.
- * @param int size in bytes
+ * @param int $size in bytes
  * @return string size as string
  */
 function human_file_size( $bytes ) {
@@ -86,8 +86,8 @@ function human_file_size( $bytes ) {
 
 /**
  * Return the relative date in relation to today. Returns something like "last hour" or "two month ago"
- * @param int unix timestamp
- * @param boolean date only
+ * @param int $timestamp unix timestamp
+ * @param boolean $dateOnly
  * @return OC_L10N_String human readable interpretation of the timestamp
  */
 function relative_modified_date( $timestamp, $dateOnly = false ) {
@@ -98,7 +98,7 @@ function relative_modified_date( $timestamp, $dateOnly = false ) {
 /**
  * Return a human readable outout for a file size.
  * @deprecated human_file_size() instead
- * @param integer size of a file in byte
+ * @param integer $bytes size of a file in byte
  * @return string human readable interpretation of a file size
  */
 function simple_file_size($bytes) {
@@ -108,9 +108,9 @@ function simple_file_size($bytes) {
 
 /**
  * Generate html code for an options block.
- * @param $options the options
- * @param $selected which one is selected?
- * @param array the parameters
+ * @param array $options the options
+ * @param mixed $selected which one is selected?
+ * @param array $params the parameters
  * @return string html options
  */
 function html_select_options($options, $selected, $params=array()) {
diff --git a/lib/public/user.php b/lib/public/user.php
index 7bac938b83..925410d37d 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -45,10 +45,10 @@ class User {
 
 	/**
 	 * Get a list of all users
-	 * @param string search pattern
-	 * @param integer $limit
-	 * @param integer $offset
-	 * @return array with all uids
+	 * @param string $search search pattern
+	 * @param int|null $limit
+	 * @param int|null $offset
+	 * @return array an array of all uids
 	 */
 	public static function getUsers( $search = '', $limit = null, $offset = null ) {
 		return \OC_User::getUsers( $search, $limit, $offset );
@@ -56,7 +56,7 @@ class User {
 
 	/**
 	 * Get the user display name of the user currently logged in.
-	 * @param string user id or null for current user
+	 * @param string|null $user user id or null for current user
 	 * @return string display name
 	 */
 	public static function getDisplayName( $user = null ) {
@@ -65,10 +65,10 @@ class User {
 
 	/**
 	 * Get a list of all display names and user ids.
-	 * @param string search pattern
-	 * @param int limit
-	 * @param int offset
-	 * @return array with all display names (value) and the correspondig uids (key)
+	 * @param string $search search pattern
+	 * @param int|null $limit
+	 * @param int|null $offset
+	 * @return array an array of all display names (value) and the correspondig uids (key)
 	 */
 	public static function getDisplayNames( $search = '', $limit = null, $offset = null ) {
 		return \OC_User::getDisplayNames( $search, $limit, $offset );
diff --git a/lib/public/util.php b/lib/public/util.php
index f06ddd6664..3166d4040d 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -86,21 +86,22 @@ class Util {
 	 * if DEBUG mode is enabled
 	 * @param string $app app name
 	 * @param \Exception $ex exception to log
+	 * @param string $level log level, defaults to \OCP\Util::FATAL
 	 */
-	public static function logException( $app, \Exception $ex ) {
+	public static function logException( $app, \Exception $ex, $level = \OCP\Util::FATAL ) {
 		$class = get_class($ex);
 		$message = $class . ': ' . $ex->getMessage();
 		if ($ex->getCode()) {
 			$message .= ' [' . $ex->getCode() . ']';
 		}
-		\OCP\Util::writeLog($app, $message, \OCP\Util::FATAL);
+		\OCP\Util::writeLog($app, $message, $level);
 		if (defined('DEBUG') and DEBUG) {
 			// also log stack trace
 			$stack = explode("\n", $ex->getTraceAsString());
 			// first element is empty
 			array_shift($stack);
 			foreach ($stack as $s) {
-				\OCP\Util::writeLog($app, 'Exception: ' . $s, \OCP\Util::FATAL);
+				\OCP\Util::writeLog($app, 'Exception: ' . $s, $level);
 			}
 
 			// include cause
@@ -110,7 +111,7 @@ class Util {
 				if ($ex->getCode()) {
 					$message .= '[' . $ex->getCode() . '] ';
 				}
-				\OCP\Util::writeLog($app, 'Exception: ' . $message, \OCP\Util::FATAL);
+				\OCP\Util::writeLog($app, 'Exception: ' . $message, $level);
 			}
 		}
 	}
@@ -202,7 +203,7 @@ class Util {
 
 	/**
 	 * Creates an url using a defined route
-	 * @param $route
+	 * @param string $route
 	 * @param array $parameters
 	 * @internal param array $args with param=>value, will be appended to the returned url
 	 * @return string the url
@@ -292,7 +293,7 @@ class Util {
 
 	/**
 	 * Returns the script name, even if the website uses one or more reverse proxies
-	 * @returns string the script name
+	 * @return string the script name
 	 */
 	public static function getScriptName() {
 		return(\OC_Request::scriptName());
@@ -379,8 +380,8 @@ class Util {
 	 * This function is used to sanitize HTML and should be applied on any
 	 * string or array of strings before displaying it on a web page.
 	 *
-	 * @param string|array of strings
-	 * @return array with sanitized strings or a single sinitized string, depends on the input parameter.
+	 * @param string|array $value
+	 * @return string|array an array of sanitized strings or a single sinitized string, depends on the input parameter.
 	 */
 	public static function sanitizeHTML( $value ) {
 		return(\OC_Util::sanitizeHTML($value));
@@ -457,7 +458,7 @@ class Util {
 	 *
 	 * @param string $dir the current folder where the user currently operates
 	 * @param int $free the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly
-	 * @return number of bytes representing
+	 * @return int number of bytes representing
 	 */
 	public static function maxUploadFilesize($dir, $free = null) {
 		return \OC_Helper::maxUploadFilesize($dir, $free);
@@ -475,7 +476,7 @@ class Util {
 	/**
 	 * Calculate PHP upload limit
 	 *
-	 * @return number of bytes representing
+	 * @return int number of bytes representing
 	 */
 	public static function uploadLimit() {
 		return \OC_Helper::uploadLimit();
@@ -483,7 +484,7 @@ class Util {
 
 	/**
 	 * Returns whether the given file name is valid
-	 * @param $file string file name to check
+	 * @param string $file file name to check
 	 * @return bool true if the file name is valid, false otherwise
 	 */
 	public static function isValidFileName($file) {
@@ -491,11 +492,19 @@ class Util {
 	}
 
 	/**
-	 * @brief Generates a cryptographic secure pseudo-random string
-	 * @param Int $length of the random string
-	 * @return String
+	 * 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);
 	}
+
+	/**
+	 * check if a password is required for each public link
+	 * @return boolean
+	 */
+	public static function isPublicLinkPasswordRequired() {
+		return \OC_Util::isPublicLinkPasswordRequired();
+	}
 }
diff --git a/settings/admin.php b/settings/admin.php
index 49dde59ce2..f9406246e7 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -60,6 +60,7 @@ $tmpl->assign('isConnectedViaHTTPS', $connectedHTTPS);
 $tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false));
 
 $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
+$tmpl->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired());
 $tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'));
 $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
 $tmpl->assign('allowMailNotification', OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'yes'));
diff --git a/settings/ajax/decryptall.php b/settings/ajax/decryptall.php
index d12df230d4..55685f778d 100644
--- a/settings/ajax/decryptall.php
+++ b/settings/ajax/decryptall.php
@@ -10,7 +10,7 @@ OC_App::loadApp('files_encryption');
 $params = array('uid' => \OCP\User::getUser(),
 				'password' => $_POST['password']);
 
-$view = new OC_FilesystemView('/');
+$view = new OC\Files\View('/');
 $util = new \OCA\Encryption\Util($view, \OCP\User::getUser());
 $l = \OC_L10N::get('settings');
 
diff --git a/settings/ajax/deletekeys.php b/settings/ajax/deletekeys.php
new file mode 100644
index 0000000000..1f84452e11
--- /dev/null
+++ b/settings/ajax/deletekeys.php
@@ -0,0 +1,17 @@
+<?php
+
+OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+
+$l = \OC_L10N::get('settings');
+$user = \OC_User::getUser();
+$view = new \OC\Files\View('/' . $user . '/files_encryption');
+
+$keyfilesDeleted = $view->deleteAll('keyfiles.backup');
+$sharekeysDeleted = $view->deleteAll('share-keys.backup');
+
+if ($keyfilesDeleted && $sharekeysDeleted) {
+	\OCP\JSON::success(array('data' => array('message' => $l->t('Encryption keys deleted permanently'))));
+} else {
+	\OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t permanently delete your encryption keys, please check your owncloud.log or ask your administrator'))));
+}
diff --git a/settings/ajax/restorekeys.php b/settings/ajax/restorekeys.php
new file mode 100644
index 0000000000..68e19c9045
--- /dev/null
+++ b/settings/ajax/restorekeys.php
@@ -0,0 +1,24 @@
+<?php
+
+OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+
+$l = \OC_L10N::get('settings');
+$user = \OC_User::getUser();
+$view = new \OC\Files\View('/' . $user . '/files_encryption');
+
+$keyfilesRestored = $view->rename('keyfiles.backup', 'keyfiles');
+$sharekeysRestored = $view->rename('share-keys.backup' , 'share-keys');
+
+if ($keyfilesRestored && $sharekeysRestored) {
+	\OCP\JSON::success(array('data' => array('message' => $l->t('Backups restored successfully'))));
+} else {
+	// if one of the move operation was succesful we remove the files back to have a consistent state
+	if($keyfilesRestored) {
+		$view->rename('keyfiles', 'keyfiles.backup');
+	}
+	if($sharekeysRestored) {
+		$view->rename('share-keys' , 'share-keys.backup');
+	}
+	\OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t restore your encryption keys, please check your owncloud.log or ask your administrator'))));
+}
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index 9f1e732996..052715555e 100644
--- a/settings/changepassword/controller.php
+++ b/settings/changepassword/controller.php
@@ -52,7 +52,7 @@ class Controller {
 
 		if (\OC_App::isEnabled('files_encryption')) {
 			//handle the recovery case
-			$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
+			$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $username);
 			$recoveryAdminEnabled = \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
 
 			$validRecoveryPassword = false;
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 5d8f9a7541..2056e567b3 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -132,7 +132,8 @@ table.grid td.date{
 span.securitywarning {color:#C33; font-weight:bold; }
 span.connectionwarning {color:#933; font-weight:bold; }
 table.shareAPI td { padding-bottom: 0.8em; }
-table.shareAPI input#shareapi_expire_after_n_days {width: 25px;}
+table.shareAPI input#shareapiExpireAfterNDays {width: 25px;}
+table.shareAPI .indent { padding-left: 2em; }
 
 #mail_settings p label:first-child {
 	display: inline-block;
diff --git a/settings/js/admin.js b/settings/js/admin.js
index c04c0505de..cd11e68442 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -31,6 +31,14 @@ $(document).ready(function(){
 		OC.AppConfig.setValue('core', $(this).attr('name'), value);
 	});
 
+	$('#shareapiDefaultExpireDate').change(function() {
+		$("#setDefaultExpireDate").toggleClass('hidden', !this.checked);
+	});
+
+	$('#allowLinks').change(function() {
+		$("#publicLinkSettings").toggleClass('hidden', !this.checked);
+	});
+
 	$('#security').change(function(){
 		$.post(OC.filePath('settings','ajax','setsecurity.php'), { enforceHTTPS: $('#forcessl').val() },function(){} );
 	});
diff --git a/settings/js/personal.js b/settings/js/personal.js
index c1f1ef7466..9967ddc7bb 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -212,17 +212,30 @@ $(document).ready(function(){
 		OC.Encryption.decryptAll(privateKeyPassword);
 	});
 
+
+	$('button:button[name="submitRestoreKeys"]').click(function() {
+		$('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", true);
+		$('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", true);
+		OC.Encryption.restoreKeys();
+	});
+
+	$('button:button[name="submitDeleteKeys"]').click(function() {
+		$('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", true);
+		$('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", true);
+		OC.Encryption.deleteKeys();
+	});
+
 	$('#decryptAll input:password[name="privateKeyPassword"]').keyup(function(event) {
 		var privateKeyPassword = $('#decryptAll input:password[id="privateKeyPassword"]').val();
 		if (privateKeyPassword !== '' ) {
-			$('#decryptAll button:button[name="submitDecryptAll"]').removeAttr("disabled");
+			$('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", false);
 			if(event.which === 13) {
 				$('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true);
 				$('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", true);
 				OC.Encryption.decryptAll(privateKeyPassword);
 			}
 		} else {
-			$('#decryptAll button:button[name="submitDecryptAll"]').attr("disabled", "true");
+			$('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true);
 		}
 	});
 
@@ -294,29 +307,59 @@ $(document).ready(function(){
 
 OC.Encryption = {
 	decryptAll: function(password) {
-		OC.Encryption.msg.startDecrypting('#decryptAll .msg');
+		var message = t('settings', 'Decrypting files... Please wait, this can take some time.');
+		OC.Encryption.msg.start('#decryptAll .msg', message);
 		$.post('ajax/decryptall.php', {password:password}, function(data) {
 			if (data.status === "error") {
-				OC.Encryption.msg.finishedDecrypting('#decryptAll .msg', data);
-				$('#decryptAll input:password[name="privateKeyPassword"]').removeAttr("disabled");
+				OC.Encryption.msg.finished('#decryptAll .msg', data);
+				$('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", false);
 			} else {
-				OC.Encryption.msg.finishedDecrypting('#decryptAll .msg', data);
+				OC.Encryption.msg.finished('#decryptAll .msg', data);
+			}
+			$('#restoreBackupKeys').removeClass('hidden');
+		});
+	},
+
+	deleteKeys: function() {
+		var message = t('settings', 'Delete encryption keys permanently.');
+		OC.Encryption.msg.start('#restoreBackupKeys .msg', message);
+		$.post('ajax/deletekeys.php', null, function(data) {
+			if (data.status === "error") {
+				OC.Encryption.msg.finished('#restoreBackupKeys .msg', data);
+				$('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", false);
+				$('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", false);
+			} else {
+				OC.Encryption.msg.finished('#restoreBackupKeys .msg', data);
+			}
+		});
+	},
+
+	restoreKeys: function() {
+		var message = t('settings', 'Restore encryption keys.');
+		OC.Encryption.msg.start('#restoreBackupKeys .msg', message);
+		$.post('ajax/restorekeys.php', {}, function(data) {
+			if (data.status === "error") {
+				OC.Encryption.msg.finished('#restoreBackupKeys .msg', data);
+				$('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", false);
+				$('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", false);
+			} else {
+				OC.Encryption.msg.finished('#restoreBackupKeys .msg', data);
 			}
 		});
 	}
 };
 
 OC.Encryption.msg={
-	startDecrypting:function(selector){
+	start:function(selector, msg){
 		var spinner = '<img src="'+ OC.imagePath('core', 'loading-small.gif') +'">';
 		$(selector)
-			.html( t('settings', 'Decrypting files... Please wait, this can take some time.') + ' ' + spinner )
+			.html( msg + ' ' + spinner )
 			.removeClass('success')
 			.removeClass('error')
 			.stop(true, true)
 			.show();
 	},
-	finishedDecrypting:function(selector, data){
+	finished:function(selector, data){
 		if( data.status === "success" ){
 			$(selector).html( data.data.message )
 				.addClass('success')
diff --git a/settings/l10n/af_ZA.php b/settings/l10n/af_ZA.php
index ff565e9cec..90094e7855 100644
--- a/settings/l10n/af_ZA.php
+++ b/settings/l10n/af_ZA.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"So-so password" => "So-so wagwoord",
 "Security Warning" => "Sekuriteits waarskuwing",
 "Password" => "Wagwoord",
 "New password" => "Nuwe wagwoord",
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index d62c69adfa..719129d6be 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -93,9 +93,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "السماح بالمشاركة عن طريق الAPI ",
 "Allow apps to use the Share API" => "السماح للتطبيقات بالمشاركة عن طريق الAPI",
 "Allow links" => "السماح بالعناوين",
-"Allow users to share items to the public with links" => "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط ",
 "Allow public uploads" => "السماح بالرفع للعامة ",
-"Allow users to enable others to upload into their publicly shared folders" => "السماح للمستخدمين بتفعيل الرفع للاخرين من خلال مجلد المشاركة العام ",
+"Allow users to share items to the public with links" => "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط ",
 "Allow resharing" => "السماح بإعادة المشاركة ",
 "Allow users to share items shared with them again" => "السماح للمستخدمين باعادة مشاركة الملفات التي تم مشاركتها معهم",
 "Allow users to share with anyone" => "السماح للمستعملين بإعادة المشاركة مع أي أحد  ",
@@ -147,8 +146,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "اختر صورة الملف الشخصي",
 "Language" => "اللغة",
 "Help translate" => "ساعد في الترجمه",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "استخدم هذا العنوان لـ  <a href=\"%s\" target=\"_blank\">الدخول الى ملفاتك عن طريق WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "البرنامج المشفر لم يعد مفعل, يرجى فك التشفير عن كل ملفاتك",
 "Log-in password" => "كلمه سر الدخول",
 "Decrypt all Files" => "فك تشفير جميع الملفات ",
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
index 3892d48a9a..5df22a024a 100644
--- a/settings/l10n/ast.php
+++ b/settings/l10n/ast.php
@@ -1,20 +1,194 @@
 <?php
 $TRANSLATIONS = array(
-"Email sent" => "Corréu unviáu",
+"Invalid value supplied for %s" => "Introdúxose un valor non válidu pa %s",
+"Saved" => "Guardáu",
+"test email settings" => "probar configuración de corréu",
+"If you received this email, the settings seem to be correct." => "Si recibisti esti mensaxe de corréu-e, la to configuración ta correuta.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Hebo un problema al unviar el mensaxe. Revisa la configuración.",
+"Email sent" => "Corréu-e unviáu",
+"You need to set your user email before being able to send test emails." => "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba.",
+"Send mode" => "Mou d'unviu",
 "Encryption" => "Cifráu",
-"Invalid request" => "Solicitú non válida",
+"Authentication method" => "Métodu d'autenticación",
+"Unable to load list from App Store" => "Nun pudo cargase la llista dende'l App Store",
+"Authentication error" => "Fallu d'autenticación",
+"Your full name has been changed." => "Camudóse'l nome completu.",
+"Unable to change full name" => "Nun pue camudase'l nome completu",
+"Group already exists" => "El grupu yá esiste",
+"Unable to add group" => "Nun pudo amestase'l grupu",
+"Files decrypted successfully" => "Descifráronse los ficheros",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nun pudieron descifrase sus ficheros. Revisa'l owncloud.log o consulta col alministrador",
+"Couldn't decrypt your files, check your password and try again" => "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtalo dempués",
+"Email saved" => "Corréu-e guardáu",
+"Invalid email" => "Corréu electrónicu non válidu",
+"Unable to delete group" => "Nun pudo desaniciase'l grupu",
+"Unable to delete user" => "Nun pudo desaniciase l'usuariu",
+"Language changed" => "Camudóse la llingua",
+"Invalid request" => "Solicitú inválida",
+"Admins can't remove themself from the admin group" => "Los alministradores nun puen desaniciase a ellos mesmos del grupu d'alministrador",
+"Unable to add user to group %s" => "Nun pudo amestase l'usuariu al grupu %s",
+"Unable to remove user from group %s" => "Nun pudo desaniciase al usuariu del grupu %s",
+"Couldn't update app." => "Nun pudo anovase l'aplicación.",
+"Wrong password" => "Contraseña incorreuta",
+"No user supplied" => "Nun s'especificó un usuariu",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Facilita una contraseña de recuperación d'alministrador, sinón podríen perdese tolos datos d'usuariu",
+"Wrong admin recovery password. Please check the password and try again." => "Contraseña de recuperación d'alministrador incorreuta. Comprueba la contraseña ya inténtalo dempués.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end nun sofita cambeos de contraseña, pero la contraseña de cifráu del usuariu anovóse afechiscamente.",
+"Unable to change password" => "Nun pudo camudase la contraseña",
+"Sending..." => "Unviando...",
+"User Documentation" => "Documentación d'usuariu",
+"Admin Documentation" => "Documentación p'alministradores",
+"Update to {appversion}" => "Anovar a {appversion}",
+"Disable" => "Desactivar",
+"Enable" => "Activar",
+"Please wait...." => "Espera, por favor....",
+"Error while disabling app" => "Fallu mientres se desactivaba l'aplicación",
+"Error while enabling app" => "Fallu mientres s'activaba l'aplicación",
+"Updating...." => "Anovando....",
+"Error while updating app" => "Fallu mientres s'anovaba l'aplicación",
 "Error" => "Fallu",
+"Update" => "Anovar",
+"Updated" => "Anováu",
+"Select a profile picture" => "Esbillar una imaxe de perfil",
+"Very weak password" => "Contraseña mui feble",
+"Weak password" => "Contraseña feble",
+"So-so password" => "Contraseña pasable",
+"Good password" => "Contraseña bona",
+"Strong password" => "Contraseña mui bona",
+"Decrypting files... Please wait, this can take some time." => "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu.",
 "deleted" => "desaniciáu",
+"undo" => "desfacer",
+"Unable to remove user" => "Imposible desaniciar al usuariu",
 "Groups" => "Grupos",
+"Group Admin" => "Alministrador del Grupu",
 "Delete" => "Desaniciar",
+"add group" => "amestar Grupu",
+"A valid username must be provided" => "Tien d'apurrise un nome d'usuariu válidu",
+"Error creating user" => "Fallu al crear usuariu",
+"A valid password must be provided" => "Tien d'apurrise una contraseña válida",
+"Warning: Home directory for user \"{user}\" already exists" => "Avisu: el direutoriu d'aniciu pal usuariu \"{user}\" yá esiste.",
+"__language_name__" => "Asturianu",
+"Everything (fatal issues, errors, warnings, info, debug)" => "Too (Información, Avisos, Fallos, debug y problemes fatales)",
+"Info, warnings, errors and fatal issues" => "Información, Avisos, Fallos y problemes fatales",
+"Warnings, errors and fatal issues" => "Avisos, fallos y problemes fatales",
+"Errors and fatal issues" => "Fallos y problemes fatales",
+"Fatal issues only" => "Namái problemes fatales",
+"None" => "Dengún",
+"Login" => "Entamar sesión",
+"Plain" => "Planu",
+"NT LAN Manager" => "Xestor de NT LAN",
+"SSL" => "SSL",
+"TLS" => "TLS",
+"Security Warning" => "Avisu de seguridá",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Tas ingresando a %s vía HTTP. Encamentámoste que configures el sirvidor pa solicitar 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." => "El direutoriu de datos y ficheros ye dablemente accesible dende Internet, darréu que'l ficheru .htaccess nun ta funcionando. Suxerímoste que configures el sirvidor web de mou que'l direutoriu de datos nun seya accesible o que muevas talu direutoriu fuera del raigañu de documentos del sirvidor web.",
+"Setup Warning" => "Avisu de configuración",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El sirvidor web entá nun ta configurado pa permitir la sincronización de ficheros yá que la interface WebDAV paez nun tar funcionando.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Por favor, vuelvi a comprobar les <a href=\"%s\">guíes de instalación</a>.",
+"Module 'fileinfo' missing" => "Nun s'atopó'l módulu \"fileinfo\"",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Nun s'atopó'l módulu PHP 'fileinfo'. Encamentámoste qu'habilites esti módulu pa obtener meyores resultaos cola deteición de tribes MIME.",
+"Your PHP version is outdated" => "La versión de PHP nun ta anovada",
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "La versión de PHP caducó. Suxerímose que l'anueves a 5.3.8 o a una más nueva porque davezu, les versiones vieyes nun funcionen bien. Puede ser qu'esta instalación nun tea funcionando bien.",
+"Locale not working" => "La configuración rexonal nun ta funcionando",
+"System locale can not be set to a one which supports UTF-8." => "Nun se pue escoyer una configuración rexonal que sofite UTF-8.",
+"This means that there might be problems with certain characters in file names." => "Esto significa que pue haber problemes con ciertos caráuteres nos nomes de los ficheros.",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Ye enforma recomendable instalar los paquetes necesarios pa poder soportar una de les siguientes configuraciones rexonales: %s. ",
+"Internet connection not working" => "La conexón a Internet nun ta 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." => "Esti sirvidor nun tien conexón a Internet. Esto significa que dalgunes de les carauterístiques nun van funcionar, como'l montaxe d'almacenamiento esternu, les notificaciones sobre anovamientos, la instalación d'aplicaciones de terceros, l'accesu a los ficheros de mou remotu o l'unviu de correos-e de notificación. Suxerimos habilitar una conexón a Internet nesti sirvidor pa esfrutar de toles funciones.",
+"Cron" => "Cron",
+"Last cron was executed at %s." => "Cron executóse per cabera vegada a les %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron executóse per cabera vegada a les %s. Esto foi hai más d'una hora, daqué anda mal.",
+"Cron was not executed yet!" => "¡Cron entá nun s'executó!",
+"Execute one task with each page loaded" => "Executar una xera con cada páxina cargada",
+"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php rexístrase nun serviciu webcron pa llamar a cron.php cada 15 minutos al traviés de HTTP.",
+"Use systems cron service to call the cron.php file every 15 minutes." => "Usa'l serviciu cron del sistema pa llamar al ficheru cron.php cada 15 minutos.",
+"Sharing" => "Compartiendo",
+"Enable Share API" => "Activar API de Compartición",
+"Allow apps to use the Share API" => "Permitir a les aplicaciones usar la API de Compartición",
+"Allow links" => "Permitir enllaces",
+"Allow public uploads" => "Permitir xubes públiques",
+"Set default expiration date" => "Afitar la data d'espiración predeterminada",
+"Expire after " => "Caduca dempués de",
+"days" => "díes",
+"Enforce expiration date" => "Facer cumplir la data de caducidá",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos col públicu per aciu d'enllaces",
+"Allow resharing" => "Permitir re-compartición",
+"Allow users to share items shared with them again" => "Permitir a los usuarios compartir de nuevu elementos ya compartíos",
+"Allow users to share with anyone" => "Permitir a los usuarios compartir con cualesquier persona",
+"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir namái colos usuarios nos sos grupos",
+"Allow mail notification" => "Permitir notificaciones per corréu-e",
+"Allow users to send mail notification for shared files" => "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartíos",
+"Security" => "Seguridá",
+"Enforce HTTPS" => "Forciar HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Forciar a los veceros a coneutase a %s per duana d'una conexón cifrada.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, conéutate a %s al traviés de HTTPS p'habilitar o deshabilitar l'aplicación de SSL.",
+"Email Server" => "Sirvidor de corréu-e",
+"This is used for sending out notifications." => "Esto úsase pa unviar notificaciones.",
+"From address" => "Dende la direición",
+"Authentication required" => "Necesítase autenticación",
+"Server address" => "Direición del sirvidor",
 "Port" => "Puertu",
+"Credentials" => "Credenciales",
+"SMTP Username" => "Nome d'usuariu SMTP",
+"SMTP Password" => "Contraseña SMTP",
+"Test email settings" => "Probar configuración de corréu electrónicu",
+"Send email" => "Unviar mensaxe",
+"Log" => "Rexistru",
+"Log level" => "Nivel de rexistru",
 "More" => "Más",
 "Less" => "Menos",
+"Version" => "Versión",
+"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>." => "Desendolcáu pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">códigu fonte</a> ta baxo llicencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Add your App" => "Amiesta la to aplicación",
+"More Apps" => "Más aplicaciones",
+"Select an App" => "Esbillar una aplicación",
+"Documentation:" => "Documentación:",
+"See application page at apps.owncloud.com" => "Ver la páxina d'aplicaciones en apps.owncloud.com",
+"See application website" => "Ver sitiu web de l'aplicación",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-llicencia otorgada por <span class=\"author\"></span>",
+"Administrator Documentation" => "Documentación d'alministrador",
+"Online Documentation" => "Documentación en llinia",
+"Forum" => "Foru",
+"Bugtracker" => "Rastrexador de fallos",
+"Commercial Support" => "Sofitu comercial",
+"Get the apps to sync your files" => "Obtener les aplicaciones pa sincronizar ficheros",
+"Show First Run Wizard again" => "Amosar nuevamente l'Encontu d'execución inicial",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usasti <strong>%s</strong> de los <strong>%s</strong> disponibles",
 "Password" => "Contraseña",
+"Your password was changed" => "Camudóse la contraseña",
+"Unable to change your password" => "Nun pudo camudase la contraseña",
+"Current password" => "Contraseña actual",
+"New password" => "Contraseña nueva",
+"Change password" => "Camudar contraseña",
+"Full Name" => "Nome completu",
 "Email" => "Corréu-e",
+"Your email address" => "Direición de corréu-e",
+"Fill in an email address to enable password recovery and receive notifications" => "Introducir una direición de corréu-e p'activar la recuperación de contraseñes y recibir notificaciones",
+"Profile picture" => "Semeya de perfil",
+"Upload new" => "Xubir otra",
+"Select new from Files" => "Esbillar otra dende Ficheros",
+"Remove image" => "Desaniciar imaxe",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Ficheru PNG o JPG. Preferiblemente cuadráu, pero vas poder retayalu.",
+"Your avatar is provided by your original account." => "L'avatar ta proporcionáu pola to cuenta orixinal.",
 "Cancel" => "Encaboxar",
+"Choose as profile image" => "Esbillar como imaxe de perfil",
+"Language" => "Llingua",
+"Help translate" => "Ayúdanos nes traducciones",
+"The encryption app is no longer enabled, please decrypt all your files" => "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros",
+"Log-in password" => "Contraseña d'accesu",
+"Decrypt all Files" => "Descifrar ficheros",
+"Login Name" => "Nome d'usuariu",
 "Create" => "Crear",
+"Admin Recovery Password" => "Recuperación de la contraseña d'alministración",
+"Enter the recovery password in order to recover the users files during password change" => "Introduz la contraseña de recuperación col envís de recuperar los ficheros de los usuarios mientres el cambéu de contraseña.",
+"Default Storage" => "Almacenamientu predetermináu",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor indica la cuota d'almacenamientu (ex: \"512 MB\" o \"12 GB\")",
+"Unlimited" => "Non llendáu",
 "Other" => "Otru",
-"Username" => "Nome d'usuariu"
+"Username" => "Nome d'usuariu",
+"Storage" => "Almacenamientu",
+"change full name" => "camudar el nome completu",
+"set new password" => "afitar nueva contraseña",
+"Default" => "Predetermináu"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 4715447b7f..9573343a1d 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -54,7 +54,6 @@ $TRANSLATIONS = array(
 "Cancel" => "Отказ",
 "Language" => "Език",
 "Help translate" => "Помогнете с превода",
-"WebDAV" => "WebDAV",
 "Login Name" => "Потребител",
 "Create" => "Създаване",
 "Default Storage" => "Хранилище по подразбиране",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index 574426ea63..a782a53bca 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -57,7 +57,6 @@ $TRANSLATIONS = array(
 "Cancel" => "বাতির",
 "Language" => "ভাষা",
 "Help translate" => "অনুবাদ করতে সহায়তা করুন",
-"WebDAV" => "WebDAV",
 "Login Name" => "প্রবেশ",
 "Create" => "তৈরী কর",
 "Default Storage" => "পূর্বনির্ধারিত সংরক্ষণাগার",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 0a4324e5a5..2a75717618 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -106,9 +106,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Habilita l'API de compartir",
 "Allow apps to use the Share API" => "Permet que les aplicacions utilitzin l'API de compartir",
 "Allow links" => "Permet enllaços",
-"Allow users to share items to the public with links" => "Permet als usuaris compartir elements amb el públic amb enllaços",
 "Allow public uploads" => "Permet pujada pública",
-"Allow users to enable others to upload into their publicly shared folders" => "Permet als usuaris habilitar pujades de tercers en les seves carpetes compartides al públic",
+"Allow users to share items to the public with links" => "Permet als usuaris compartir elements amb el públic amb enllaços",
 "Allow resharing" => "Permet compartir de nou",
 "Allow users to share items shared with them again" => "Permet als usuaris compartir de nou elements ja compartits amb ells",
 "Allow users to share with anyone" => "Permet compartir amb qualsevol",
@@ -170,8 +169,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Selecciona com a imatge de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ajudeu-nos amb la traducció",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers",
 "Log-in password" => "Contrasenya d'accés",
 "Decrypt all Files" => "Desencripta tots els fitxers",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 8a33e4691e..00ac8bcff1 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -106,17 +106,18 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Povolit API sdílení",
 "Allow apps to use the Share API" => "Povolit aplikacím používat API sdílení",
 "Allow links" => "Povolit odkazy",
-"Allow users to share items to the public with links" => "Povolit uživatelům sdílet položky veřejně pomocí odkazů",
 "Allow public uploads" => "Povolit veřejné nahrávání souborů",
-"Allow users to enable others to upload into their publicly shared folders" => "Povolit uživatelům, aby mohli ostatním umožnit nahrávat do jejich veřejně sdílené složky",
+"Set default expiration date" => "Nastavit výchozí datum vypršení platnosti",
+"Expire after " => "Vyprší po",
+"days" => "dnech",
+"Enforce expiration date" => "Vynutit datum vypršení",
+"Allow users to share items to the public with links" => "Povolit uživatelům sdílet položky veřejně pomocí odkazů",
 "Allow resharing" => "Povolit znovu-sdílení",
 "Allow users to share items shared with them again" => "Povolit uživatelům znovu sdílet položky, které jsou pro ně sdíleny",
 "Allow users to share with anyone" => "Povolit uživatelům sdílet s kýmkoliv",
 "Allow users to only share with users in their groups" => "Povolit uživatelům sdílet pouze s uživateli v jejich skupinách",
 "Allow mail notification" => "Povolit e-mailová upozornění",
 "Allow users to send mail notification for shared files" => "Povolit uživatelům odesílat e-mailová upozornění pro sdílené soubory",
-"Expire after " => "Vyprší po",
-"days" => "dnech",
 "Security" => "Zabezpečení",
 "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.",
@@ -173,8 +174,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Vybrat jako profilový obrázek",
 "Language" => "Jazyk",
 "Help translate" => "Pomoci s překladem",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Použijte <a href=\"%s\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "Šifrovací aplikace již není spuštěna, dešifrujte prosím všechny své soubory",
 "Log-in password" => "Přihlašovací heslo",
 "Decrypt all Files" => "Odšifrovat všechny soubory",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 0a755da9fd..e37b776dc2 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -93,9 +93,10 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Aktiver Share API",
 "Allow apps to use the Share API" => "Tillad apps til at bruge Share API",
 "Allow links" => "Tillad links",
-"Allow users to share items to the public with links" => "Tillad brugere at dele elementer til offentligheden med links",
 "Allow public uploads" => "Tillad offentlig upload",
-"Allow users to enable others to upload into their publicly shared folders" => "Tillad brugere at give andre mulighed for at uploade i deres offentligt delte mapper",
+"Expire after " => "Udløber efter",
+"days" => "dage",
+"Allow users to share items to the public with links" => "Tillad brugere at dele elementer til offentligheden med links",
 "Allow resharing" => "Tillad videredeling",
 "Allow users to share items shared with them again" => "Tillad brugere at dele elementer delt med dem igen",
 "Allow users to share with anyone" => "Tillad brugere at dele med alle",
@@ -154,8 +155,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Vælg som profilbillede",
 "Language" => "Sprog",
 "Help translate" => "Hjælp med oversættelsen",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Brug denne adresse for at <a href=\"%s\" target=\"_blank\">tilgå dine filer via WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer",
 "Log-in password" => "Log-in kodeord",
 "Decrypt all Files" => "Dekrypter alle Filer ",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 2255c2e8bc..31d353687c 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "Dateien erfolgreich entschlüsselt",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
 "Couldn't decrypt your files, check your password and try again" => "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut.",
+"Encryption keys deleted permanently" => "Verschlüsselungsschlüssel dauerhaft gelöscht",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
 "Email saved" => "E-Mail Adresse gespeichert",
 "Invalid email" => "Ungültige E-Mail Adresse",
 "Unable to delete group" => "Gruppe konnte nicht gelöscht werden",
 "Unable to delete user" => "Benutzer konnte nicht gelöscht werden",
+"Backups restored successfully" => "Backups erfolgreich wiederhergestellt",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
 "Language changed" => "Sprache geändert",
 "Invalid request" => "Fehlerhafte Anfrage",
 "Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der Admin-Gruppe löschen.",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
 "Good password" => "Gutes Passwort",
 "Strong password" => "Starkes Passwort",
 "Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
+"Delete encryption keys permanently." => "Verschlüsselungsschlüssel dauerhaft löschen.",
+"Restore encryption keys." => "Verschlüsselungsschlüssel wiederherstellen.",
 "deleted" => "gelöscht",
 "undo" => "rückgängig machen",
 "Unable to remove user" => "Benutzer konnte nicht entfernt werden.",
@@ -106,9 +112,13 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Aktiviere Sharing-API",
 "Allow apps to use the Share API" => "Erlaubt Apps die Nutzung der Share-API",
 "Allow links" => "Erlaubt Links",
-"Allow users to share items to the public with links" => "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen",
+"Enforce password protection" => "Passwortschutz erzwingen",
 "Allow public uploads" => "Öffentliches Hochladen erlauben",
-"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen",
+"Set default expiration date" => "Setze  Ablaufdatum",
+"Expire after " => "Ablauf nach dem",
+"days" => "Tage",
+"Enforce expiration date" => "Ablaufdatum erzwingen",
+"Allow users to share items to the public with links" => "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen",
 "Allow resharing" => "Erlaubt erneutes Teilen",
 "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
 "Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
@@ -171,11 +181,12 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Als Profilbild wählen",
 "Language" => "Sprache",
 "Help translate" => "Hilf bei der Übersetzung",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "Die Verschlüsselungsanwendung ist nicht länger aktiviert, bitte entschlüsseln Sie alle ihre Daten.",
 "Log-in password" => "Login-Passwort",
 "Decrypt all Files" => "Alle Dateien entschlüsseln",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Deine Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Lösche diese nur dann dauerhaft, wenn Du dir sicher bist, dass alle Dateien korrekt entschlüsselt wurden.",
+"Restore Encryption Keys" => "Verschlüsselungsschlüssel wiederherstellen",
+"Delete Encryption Keys" => "Verschlüsselungsschlüssel löschen",
 "Login Name" => "Loginname",
 "Create" => "Anlegen",
 "Admin Recovery Password" => "Admin-Wiederherstellungspasswort",
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
index 9bfe06d023..77d2268442 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -57,9 +57,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Share-API aktivieren",
 "Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
 "Allow links" => "Links erlauben",
-"Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
 "Allow public uploads" => "Erlaube öffentliches hochladen",
-"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen",
+"Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
 "Allow resharing" => "Erlaube Weiterverteilen",
 "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
 "Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
@@ -100,7 +99,6 @@ $TRANSLATIONS = array(
 "Cancel" => "Abbrechen",
 "Language" => "Sprache",
 "Help translate" => "Helfen Sie bei der Übersetzung",
-"WebDAV" => "WebDAV",
 "Log-in password" => "Login-Passwort",
 "Decrypt all Files" => "Alle Dateien entschlüsseln",
 "Login Name" => "Loginname",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 16622c80b0..d36bb0f7a1 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "Dateien erfolgreich entschlüsselt",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
 "Couldn't decrypt your files, check your password and try again" => "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut.",
+"Encryption keys deleted permanently" => "Verschlüsselungsschlüssel dauerhaft gelöscht",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfen Sie bitte Ihre owncloud.log oder frage Deinen Administrator",
 "Email saved" => "E-Mail-Adresse gespeichert",
 "Invalid email" => "Ungültige E-Mail-Adresse",
 "Unable to delete group" => "Die Gruppe konnte nicht gelöscht werden",
 "Unable to delete user" => "Der Benutzer konnte nicht gelöscht werden",
+"Backups restored successfully" => "Backups erfolgreich wiederhergestellt",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
 "Language changed" => "Sprache geändert",
 "Invalid request" => "Ungültige Anforderung",
 "Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
 "Good password" => "Gutes Passwort",
 "Strong password" => "Starkes Passwort",
 "Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
+"Delete encryption keys permanently." => "Verschlüsselungsschlüssel dauerhaft löschen.",
+"Restore encryption keys." => "Verschlüsselungsschlüssel wiederherstellen.",
 "deleted" => "gelöscht",
 "undo" => "rückgängig machen",
 "Unable to remove user" => "Der Benutzer konnte nicht entfernt werden.",
@@ -106,9 +112,13 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Share-API aktivieren",
 "Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
 "Allow links" => "Links erlauben",
-"Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
+"Enforce password protection" => "Passwortschutz erzwingen",
 "Allow public uploads" => "Öffentliches Hochladen erlauben",
-"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen",
+"Set default expiration date" => "Setze  Ablaufdatum",
+"Expire after " => "Ablauf nach dem",
+"days" => "Tage",
+"Enforce expiration date" => "Ablaufdatum erzwingen",
+"Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
 "Allow resharing" => "Erlaube Weiterverteilen",
 "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
 "Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
@@ -171,11 +181,12 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Als Profilbild wählen",
 "Language" => "Sprache",
 "Help translate" => "Helfen Sie bei der Übersetzung",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "Die Verschlüsselungsanwendung ist nicht länger aktiv, bitte entschlüsseln Sie alle ihre Daten",
 "Log-in password" => "Login-Passwort",
 "Decrypt all Files" => "Alle Dateien entschlüsseln",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Ihre Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Löschen Sie diese nur dann dauerhaft, wenn Sie sich sicher sind, dass alle Dateien korrekt entschlüsselt wurden.",
+"Restore Encryption Keys" => "Verschlüsselungsschlüssel wiederherstellen",
+"Delete Encryption Keys" => "Verschlüsselungsschlüssel löschen",
 "Login Name" => "Loginname",
 "Create" => "Erstellen",
 "Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 1ca97b63da..a76f1eb54e 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -16,10 +16,17 @@ $TRANSLATIONS = array(
 "Unable to change full name" => "Δεν ήταν δυνατή η αλλαγή του πλήρους ονόματός σας",
 "Group already exists" => "Η ομάδα υπάρχει ήδη",
 "Unable to add group" => "Αδυναμία προσθήκης ομάδας",
+"Files decrypted successfully" => "Τα αρχεία αποκρυπτογραφήθηκαν με επιτυχία",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων, παρακαλώ ελέγξτε το owncloud.log ή ενημερωθείτε από τον διαχειριστή συστημάτων σας",
+"Couldn't decrypt your files, check your password and try again" => "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων σας, ελέγξτε τον κωδικό πρόσβασής σας και δοκιμάστε πάλι",
+"Encryption keys deleted permanently" => "Τα κλειδιά κρυπτογράφησης αφαιρέθηκαν οριστικά",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Δεν ήταν δυνατή η οριστική διαγραφή των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
 "Email saved" => "Το email αποθηκεύτηκε ",
 "Invalid email" => "Μη έγκυρο email",
 "Unable to delete group" => "Αδυναμία διαγραφής ομάδας",
 "Unable to delete user" => "Αδυναμία διαγραφής χρήστη",
+"Backups restored successfully" => "Η επαναφορά αντιγράφων ασφαλείας έγινε με επιτυχία",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Δεν ήταν δυνατή η επαναφορά των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
 "Language changed" => "Η γλώσσα άλλαξε",
 "Invalid request" => "Μη έγκυρο αίτημα",
 "Admins can't remove themself from the admin group" => "Οι διαχειριστές δεν μπορούν να αφαιρέσουν τους εαυτούς τους από την ομάδα των διαχειριστών",
@@ -103,14 +110,18 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Ενεργοποίηση API διαμοιρασμού",
 "Allow apps to use the Share API" => "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ",
 "Allow links" => "Επιτρέπονται οι σύνδεσμοι",
-"Allow users to share items to the public with links" => "Επιτρέπει τους χρήστες να διαμοιράζουν δημόσια με συνδέσμους",
 "Allow public uploads" => "Επιτρέπεται το κοινόχρηστο ανέβασμα",
-"Allow users to enable others to upload into their publicly shared folders" => "Επιτρέπει τους χρήστες να καθιστούν άλλους χρήστες ικανούς να ανεβάζουν στους κοινόχρηστους φακέλους τους",
+"Set default expiration date" => "Ορισμός ερήμην ημερομηνίας λήξης",
+"Expire after " => "Λήξη μετά από",
+"days" => "ημέρες",
+"Enforce expiration date" => "Επιβολή της ημερομηνίας λήξης",
+"Allow users to share items to the public with links" => "Επιτρέπει τους χρήστες να διαμοιράζουν δημόσια με συνδέσμους",
 "Allow resharing" => "Επιτρέπεται ο επαναδιαμοιρασμός",
 "Allow users to share items shared with them again" => "Επιτρέπει στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί",
 "Allow users to share with anyone" => "Επιτρέπεται στους χρήστες ο διαμοιρασμός με οποιονδήποτε",
 "Allow users to only share with users in their groups" => "Επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας",
 "Allow mail notification" => "Επιτρέπονται ειδοποιήσεις ηλεκτρονικού ταχυδρομείου",
+"Allow users to send mail notification for shared files" => "Επιτρέψτε στους χρήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία",
 "Security" => "Ασφάλεια",
 "Enforce HTTPS" => "Επιβολή χρήσης HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Επιβάλλει τους πελάτες να συνδέονται στο %s μέσω κρυπτογραφημένης σύνδεσης.",
@@ -167,11 +178,12 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Επιλογή εικόνας προφίλ",
 "Language" => "Γλώσσα",
 "Help translate" => "Βοηθήστε στη μετάφραση",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Χρησιμοποιήστε αυτήν την διεύθυνση για να αποκτήσετε <a href=\"%s\" target=\"_blank\">πρόσβαση στα αρχεία σας μέσω WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "Η εφαρμογή κρυπτογράφησης δεν είναι πλέον ενεργοποιημένη, παρακαλώ αποκρυπτογραφήστε όλα τα αρχεία σας",
 "Log-in password" => "Συνθηματικό εισόδου",
 "Decrypt all Files" => "Αποκρυπτογράφηση όλων των Αρχείων",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Τα κλειδιά κρυπτογράφησής σας μεταφέρονται σε θέση αντιγράφου ασφαλείας. Αν κάτι πάει στραβά, μπορείτε να τα επαναφέρετε. Διαγράψτε τα οριστικά μόνο αν είστε βέβαιοι ότι όλα τα αρχεία αποκρυπτογραφήθηκαν σωστά.",
+"Restore Encryption Keys" => "Επαναφορά κλειδιών κρυπτογράφησης",
+"Delete Encryption Keys" => "Διαγραφή κλειδιών κρυπτογράφησης",
 "Login Name" => "Όνομα Σύνδεσης",
 "Create" => "Δημιουργία",
 "Admin Recovery Password" => "Κωδικός Επαναφοράς Διαχειριστή ",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index cbfde8f5f7..800e9a58ce 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "Files decrypted successfully",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Couldn't decrypt your files, please check your owncloud.log or ask your administrator",
 "Couldn't decrypt your files, check your password and try again" => "Couldn't decrypt your files, check your password and try again",
+"Encryption keys deleted permanently" => "Encryption keys deleted permanently",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator",
 "Email saved" => "Email saved",
 "Invalid email" => "Invalid email",
 "Unable to delete group" => "Unable to delete group",
 "Unable to delete user" => "Unable to delete user",
+"Backups restored successfully" => "Backups restored successfully",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator",
 "Language changed" => "Language changed",
 "Invalid request" => "Invalid request",
 "Admins can't remove themself from the admin group" => "Admins can't remove themselves from the admin group",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
 "Good password" => "Good password",
 "Strong password" => "Strong password",
 "Decrypting files... Please wait, this can take some time." => "Decrypting files... Please wait, this can take some time.",
+"Delete encryption keys permanently." => "Delete encryption keys permanently.",
+"Restore encryption keys." => "Restore encryption keys.",
 "deleted" => "deleted",
 "undo" => "undo",
 "Unable to remove user" => "Unable to remove user",
@@ -106,18 +112,18 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Enable Share API",
 "Allow apps to use the Share API" => "Allow apps to use the Share API",
 "Allow links" => "Allow links",
-"Allow users to share items to the public with links" => "Allow users to share items to the public with links",
 "Allow public uploads" => "Allow public uploads",
-"Allow users to enable others to upload into their publicly shared folders" => "Allow users to enable others to upload into their publicly shared folders",
+"Set default expiration date" => "Set default expiry date",
+"Expire after " => "Expire after ",
+"days" => "days",
+"Enforce expiration date" => "Enforce expiry date",
+"Allow users to share items to the public with links" => "Allow users to share items to the public with links",
 "Allow resharing" => "Allow resharing",
 "Allow users to share items shared with them again" => "Allow users to share items shared with them again",
 "Allow users to share with anyone" => "Allow users to share with anyone",
 "Allow users to only share with users in their groups" => "Allow users to only share with users in their groups",
 "Allow mail notification" => "Allow mail notification",
 "Allow users to send mail notification for shared files" => "Allow users to send mail notification for shared files",
-"Expire after " => "Expire after ",
-"days" => "days",
-"Expire shares by default after N days" => "Expire shares by default after N days",
 "Security" => "Security",
 "Enforce HTTPS" => "Enforce HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forces the clients to connect to %s via an encrypted connection.",
@@ -174,11 +180,12 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Choose as profile image",
 "Language" => "Language",
 "Help translate" => "Help translate",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "The encryption app is no longer enabled, please decrypt all your files",
 "Log-in password" => "Log-in password",
 "Decrypt all Files" => "Decrypt all Files",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly.",
+"Restore Encryption Keys" => "Restore Encryption Keys",
+"Delete Encryption Keys" => "Delete Encryption Keys",
 "Login Name" => "Login Name",
 "Create" => "Create",
 "Admin Recovery Password" => "Admin Recovery Password",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index f63c5140a4..c2cd53ab7c 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -73,7 +73,6 @@ $TRANSLATIONS = array(
 "Cancel" => "Nuligi",
 "Language" => "Lingvo",
 "Help translate" => "Helpu traduki",
-"WebDAV" => "WebDAV",
 "Login Name" => "Ensaluti",
 "Create" => "Krei",
 "Default Storage" => "Defaŭlta konservejo",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 5feb443690..1fa9da4008 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "Los archivos fueron descifrados",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con su administrador",
 "Couldn't decrypt your files, check your password and try again" => "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo",
+"Encryption keys deleted permanently" => "Claves de cifrado eliminadas permanentemente",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "No se pudieron eliminar permanentemente sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
 "Email saved" => "Correo electrónico guardado",
 "Invalid email" => "Correo electrónico no válido",
 "Unable to delete group" => "No se pudo eliminar el grupo",
 "Unable to delete user" => "No se pudo eliminar el usuario",
+"Backups restored successfully" => "Copia de seguridad restaurada",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "No se pudieron restarurar sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
 "Language changed" => "Idioma cambiado",
 "Invalid request" => "Petición no válida",
 "Admins can't remove themself from the admin group" => "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
 "Good password" => "Contraseña buena",
 "Strong password" => "Contraseña muy buena",
 "Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
+"Delete encryption keys permanently." => "Eliminar claves de cifrado permanentemente.",
+"Restore encryption keys." => "Restaurar claves de cifrado.",
 "deleted" => "eliminado",
 "undo" => "deshacer",
 "Unable to remove user" => "Imposible eliminar al usuario",
@@ -106,18 +112,19 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Activar API de Compartición",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones utilizar la API de Compartición",
 "Allow links" => "Permitir enlaces",
-"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos con el público mediante enlaces",
+"Enforce password protection" => "Mejora la protección por contraseña.",
 "Allow public uploads" => "Permitir subidas públicas",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente",
+"Set default expiration date" => "Establecer fecha de caducidad predeterminada",
+"Expire after " => "Caduca luego de",
+"days" => "días",
+"Enforce expiration date" => "Imponer fecha de caducidad",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos con el público mediante enlaces",
 "Allow resharing" => "Permitir re-compartición",
 "Allow users to share items shared with them again" => "Permitir a los usuarios compartir de nuevo elementos ya compartidos",
 "Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquier persona",
 "Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los usuarios en sus grupos",
 "Allow mail notification" => "Permitir notificaciones por correo electrónico",
 "Allow users to send mail notification for shared files" => "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos",
-"Expire after " => "Caduca luego de",
-"days" => "días",
-"Expire shares by default after N days" => "Archivos compartidos caducan luego de N días",
 "Security" => "Seguridad",
 "Enforce HTTPS" => "Forzar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
@@ -174,11 +181,12 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Seleccionar como imagen de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ayúdanos a traducir",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta dirección para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a través de WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
 "Log-in password" => "Contraseña de acceso",
 "Decrypt all Files" => "Descifrar archivos",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Sus claves de cifrado se archivarán en una localización segura. Así en caso de que algo fuese mal podrá recuperan sus claves. Borre sus claves de cifrado permanentemente solamente si esta seguro de que sus archivos han sido descifrados correctamente.",
+"Restore Encryption Keys" => "Restaurar claves de cifrado",
+"Delete Encryption Keys" => "Eliminar claves de cifrado",
 "Login Name" => "Nombre de usuario",
 "Create" => "Crear",
 "Admin Recovery Password" => "Recuperación de la contraseña de administración",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 7d834e9170..f212b842ed 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -101,9 +101,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Habilitar Share API",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API",
 "Allow links" => "Permitir enlaces",
-"Allow users to share items to the public with links" => "Permitir a los usuarios compartir enlaces públicos",
 "Allow public uploads" => "Permitir subidas públicas",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir que los usuarios autoricen a otros a subir archivos en sus directorios públicos compartidos",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir enlaces públicos",
 "Allow resharing" => "Permitir Re-Compartir",
 "Allow users to share items shared with them again" => "Permite a los usuarios volver a compartir items que les fueron compartidos",
 "Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquiera.",
@@ -166,8 +165,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Elegir como imagen de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ayudanos a traducir",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vía WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos.",
 "Log-in password" => "Clave de acceso",
 "Decrypt all Files" => "Desencriptar todos los archivos",
diff --git a/settings/l10n/es_MX.php b/settings/l10n/es_MX.php
index 2eb3946cbb..84d0ffd9bd 100644
--- a/settings/l10n/es_MX.php
+++ b/settings/l10n/es_MX.php
@@ -80,9 +80,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Activar API de Compartición",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones utilizar la API de Compartición",
 "Allow links" => "Permitir enlaces",
-"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos con el público mediante enlaces",
 "Allow public uploads" => "Permitir subidas públicas",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos con el público mediante enlaces",
 "Allow resharing" => "Permitir re-compartición",
 "Allow users to share items shared with them again" => "Permitir a los usuarios compartir de nuevo elementos ya compartidos",
 "Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquier persona",
@@ -132,8 +131,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Seleccionar como imagen de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ayúdanos a traducir",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vía WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
 "Log-in password" => "Contraseña de acceso",
 "Decrypt all Files" => "Descifrar archivos",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index a76b73c9ae..7e85505bbc 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -106,18 +106,16 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Luba Share API",
 "Allow apps to use the Share API" => "Luba rakendustel kasutada Share API-t",
 "Allow links" => "Luba lingid",
-"Allow users to share items to the public with links" => "Luba kasutajatel jagada kirjeid avalike linkidega",
 "Allow public uploads" => "Luba avalikud üleslaadimised",
-"Allow users to enable others to upload into their publicly shared folders" => "Luba kasutajatel üleslaadimine teiste poolt oma avalikult jagatud kataloogidesse ",
+"Expire after " => "Aegu pärast",
+"days" => "päeva",
+"Allow users to share items to the public with links" => "Luba kasutajatel jagada kirjeid avalike linkidega",
 "Allow resharing" => "Luba edasijagamine",
 "Allow users to share items shared with them again" => "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud",
 "Allow users to share with anyone" => "Luba kasutajatel kõigiga jagada",
 "Allow users to only share with users in their groups" => "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad",
 "Allow mail notification" => "Luba teavitused e-postiga",
 "Allow users to send mail notification for shared files" => "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta",
-"Expire after " => "Aegu pärast",
-"days" => "päeva",
-"Expire shares by default after N days" => "Peata jagamine N päeva möödudes",
 "Security" => "Turvalisus",
 "Enforce HTTPS" => "Sunni peale HTTPS-i kasutamine",
 "Forces the clients to connect to %s via an encrypted connection." => "Sunnib kliente %s ühenduma krüpteeritult.",
@@ -174,8 +172,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Vali profiilipildiks",
 "Language" => "Keel",
 "Help translate" => "Aita tõlkida",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid",
 "Log-in password" => "Sisselogimise parool",
 "Decrypt all Files" => "Dekrüpteeri kõik failid",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 054a40a61b..29e9e42abb 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Gordeta",
 "Email sent" => "Eposta bidalia",
 "Encryption" => "Enkriptazioa",
 "Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
@@ -36,6 +37,11 @@ $TRANSLATIONS = array(
 "Update" => "Eguneratu",
 "Updated" => "Eguneratuta",
 "Select a profile picture" => "Profil argazkia aukeratu",
+"Very weak password" => "Pasahitz oso ahula",
+"Weak password" => "Pasahitz ahula",
+"So-so password" => "Halamoduzko pasahitza",
+"Good password" => "Pasahitz ona",
+"Strong password" => "Pasahitz sendoa",
 "deleted" => "ezabatuta",
 "undo" => "desegin",
 "Unable to remove user" => "Ezin izan da erabiltzailea aldatu",
@@ -73,9 +79,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Gaitu Elkarbanatze APIa",
 "Allow apps to use the Share API" => "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko",
 "Allow links" => "Baimendu loturak",
-"Allow users to share items to the public with links" => "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen",
 "Allow public uploads" => "Baimendu igoera publikoak",
-"Allow users to enable others to upload into their publicly shared folders" => "Baimendu erabiltzaileak besteak bere partekatutako karpetetan fitxategiak igotzea",
+"Allow users to share items to the public with links" => "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen",
 "Allow resharing" => "Baimendu birpartekatzea",
 "Allow users to share items shared with them again" => "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen",
 "Allow users to share with anyone" => "Baimendu erabiltzaileak edonorekin elkarbanatzen",
@@ -125,8 +130,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Profil irudi bezala aukeratu",
 "Language" => "Hizkuntza",
 "Help translate" => "Lagundu itzultzen",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak.",
 "Log-in password" => "Saioa hasteko pasahitza",
 "Decrypt all Files" => "Desenkripattu fitxategi guztiak",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index f42a263c3f..366f7ac699 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -35,6 +35,10 @@ $TRANSLATIONS = array(
 "Update" => "به روز رسانی",
 "Updated" => "بروز رسانی انجام شد",
 "Select a profile picture" => "انتخاب تصویر پروفایل",
+"Weak password" => "رمز عبور ضعیف",
+"So-so password" => "رمز عبور متوسط",
+"Good password" => "رمز عبور خوب",
+"Strong password" => "رمز عبور قوی",
 "Decrypting files... Please wait, this can take some time." => "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد.",
 "deleted" => "حذف شده",
 "undo" => "بازگشت",
@@ -68,9 +72,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "فعال کردن API اشتراک گذاری",
 "Allow apps to use the Share API" => "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
 "Allow links" => "اجازه ی لینک ها",
-"Allow users to share items to the public with links" => "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها",
 "Allow public uploads" => "اجازه بارگذاری عمومی",
-"Allow users to enable others to upload into their publicly shared folders" => "به کاربران اجازه داده شود که امکان بارگذاری در پوشه هایی که بصورت عمومی به اشتراک گذاشته اند را برای سایرین فعال سازند",
+"Allow users to share items to the public with links" => "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها",
 "Allow resharing" => "مجوز اشتراک گذاری مجدد",
 "Allow users to share items shared with them again" => "اجازه به کاربران برای اشتراک گذاری دوباره با آنها",
 "Allow users to share with anyone" => "اجازه به کابران برای اشتراک گذاری با همه",
@@ -120,8 +123,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "یک تصویر پروفایل انتخاب کنید",
 "Language" => "زبان",
 "Help translate" => "به ترجمه آن کمک کنید",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "از این آدرس استفاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به فایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>",
 "Log-in password" => "رمز ورود",
 "Decrypt all Files" => "تمام فایلها رمزگشایی شود",
 "Login Name" => "نام کاربری",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 15e7b167b9..966313a5a8 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -19,10 +19,12 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "Tiedostojen salaus purettiin onnistuneesti",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tiedosto tai ota yhteys ylläpitäjään",
 "Couldn't decrypt your files, check your password and try again" => "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen",
+"Encryption keys deleted permanently" => "Salausavaimet poistettiin pysyvästi",
 "Email saved" => "Sähköposti tallennettu",
 "Invalid email" => "Virheellinen sähköposti",
 "Unable to delete group" => "Ryhmän poisto epäonnistui",
 "Unable to delete user" => "Käyttäjän poisto epäonnistui",
+"Backups restored successfully" => "Varmuuskopiot palautettiin onnistuneesti",
 "Language changed" => "Kieli on vaihdettu",
 "Invalid request" => "Virheellinen pyyntö",
 "Admins can't remove themself from the admin group" => "Ylläpitäjät eivät poistaa omia tunnuksiaan ylläpitäjien ryhmästä",
@@ -52,6 +54,8 @@ $TRANSLATIONS = array(
 "Good password" => "Hyvä salasana",
 "Strong password" => "Vahva salasana",
 "Decrypting files... Please wait, this can take some time." => "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
+"Delete encryption keys permanently." => "Poista salausavaimet pysyvästi.",
+"Restore encryption keys." => "Palauta salausavaimet.",
 "deleted" => "poistettu",
 "undo" => "kumoa",
 "Unable to remove user" => "Käyttäjän poistaminen ei onnistunut",
@@ -96,20 +100,22 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Käytä jakamisen ohjelmointirajapintaa",
 "Allow apps to use the Share API" => "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
 "Allow links" => "Salli linkit",
-"Allow users to share items to the public with links" => "Salli käyttäjien jakaa kohteita käyttäen linkkejä",
 "Allow public uploads" => "Salli julkiset lähetykset",
+"Set default expiration date" => "Aseta oletusvanhenemispäivä",
+"Expire after " => "Vanhenna",
+"days" => "päivän jälkeen",
+"Enforce expiration date" => "Pakota vanhenemispäivä",
+"Allow users to share items to the public with links" => "Salli käyttäjien jakaa kohteita käyttäen linkkejä",
 "Allow resharing" => "Salli uudelleenjakaminen",
 "Allow users to share items shared with them again" => "Mahdollistaa käyttäjien jakavan uudelleen heidän kanssaan jaettuja kohteita",
 "Allow users to share with anyone" => "Salli käyttäjien jakaa kenen tahansa kanssa",
 "Allow users to only share with users in their groups" => "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken",
 "Allow mail notification" => "Salli sähköposti-ilmoitukset",
 "Allow users to send mail notification for shared files" => "Salli käyttäjien lähettää sähköposti-ilmoituksia jaetuista tiedostoista",
-"Expire after " => "Vanhenna",
-"days" => "päivän jälkeen",
-"Expire shares by default after N days" => "Vanhenna jaot oletuksena N päivän jälkeen",
 "Security" => "Tietoturva",
 "Enforce HTTPS" => "Pakota HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Yhdistä %siin HTTPS-yhteydellä ottaaksesi käyttöön tai poistaaksesi käytöstä SSL-pakotteen.",
 "Email Server" => "Sähköpostipalvelin",
 "This is used for sending out notifications." => "Tätä käytetään ilmoitusten lähettämiseen.",
 "From address" => "Lähettäjän osoite",
@@ -162,11 +168,11 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Valitse profiilikuvaksi",
 "Language" => "Kieli",
 "Help translate" => "Auta kääntämisessä",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\">käyttääksesi tiedostojasi WebDAVin kautta</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus",
 "Log-in password" => "Kirjautumissalasana",
 "Decrypt all Files" => "Pura kaikkien tiedostojen salaus",
+"Restore Encryption Keys" => "Palauta salausavaimet",
+"Delete Encryption Keys" => "Poista salausavaimet",
 "Login Name" => "Kirjautumisnimi",
 "Create" => "Luo",
 "Default Storage" => "Oletustallennustila",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index da109c0467..ee66a8159c 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -106,18 +106,18 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Activer l'API de partage",
 "Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage",
 "Allow links" => "Autoriser les liens",
-"Allow users to share items to the public with links" => "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens",
 "Allow public uploads" => "Autoriser les téléversements publics",
-"Allow users to enable others to upload into their publicly shared folders" => "Permet d'autoriser les autres utilisateurs à téléverser dans le dossier partagé public de l'utilisateur",
+"Set default expiration date" => "Spécifier la date d'expiration par défaut",
+"Expire after " => "Expire après",
+"days" => "jours",
+"Enforce expiration date" => "Impose la date d'expiration",
+"Allow users to share items to the public with links" => "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens",
 "Allow resharing" => "Autoriser le repartage",
 "Allow users to share items shared with them again" => "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux",
 "Allow users to share with anyone" => "Autoriser les utilisateurs à partager avec tout le monde",
 "Allow users to only share with users in their groups" => "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement",
 "Allow mail notification" => "Autoriser les notifications par couriel",
 "Allow users to send mail notification for shared files" => "Autoriser les utilisateurs à envoyer une notification par courriel concernant les fichiers partagés",
-"Expire after " => "Expire après",
-"days" => "jours",
-"Expire shares by default after N days" => "Par défaut, les partages expireront après N jours",
 "Security" => "Sécurité",
 "Enforce HTTPS" => "Forcer HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forcer les clients à se connecter à %s via une connexion chiffrée.",
@@ -174,8 +174,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Choisir en temps que photo de profil ",
 "Language" => "Langue",
 "Help translate" => "Aidez à traduire",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utiliser cette adresse pour <a href=\"%s\" target=\"_blank\"> accéder à vos fichiers par WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "L'app de chiffrement n’est plus activée, veuillez déchiffrer tous vos fichiers",
 "Log-in password" => "Mot de passe de connexion",
 "Decrypt all Files" => "Déchiffrer tous les fichiers",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 82b7db6ec5..61ce4cc1fd 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "Ficheiros descifrados satisfactoriamente",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Non foi posíbel descifrar os seus ficheiros. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
 "Couldn't decrypt your files, check your password and try again" => "Non foi posíbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo",
+"Encryption keys deleted permanently" => "As chaves de cifrado foron eliminadas permanentemente",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Non foi posíbel eliminar permanentemente as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
 "Email saved" => "Correo gardado",
 "Invalid email" => "Correo incorrecto",
 "Unable to delete group" => "Non é posíbel eliminar o grupo.",
 "Unable to delete user" => "Non é posíbel eliminar o usuario",
+"Backups restored successfully" => "As copias de seguranza foron restauradas satisfactoriamente",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Non foi posíbel restaurar as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
 "Language changed" => "O idioma cambiou",
 "Invalid request" => "Petición incorrecta",
 "Admins can't remove themself from the admin group" => "Os administradores non poden eliminarse a si mesmos do grupo admin",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
 "Good password" => "Bo contrasinal",
 "Strong password" => "Contrasinal forte",
 "Decrypting files... Please wait, this can take some time." => "Descifrando ficheiros... isto pode levar un anaco.",
+"Delete encryption keys permanently." => "Eliminar permanentemente as chaves de cifrado.",
+"Restore encryption keys." => "Restaurar as chaves de cifrado.",
 "deleted" => "eliminado",
 "undo" => "desfacer",
 "Unable to remove user" => "Non é posíbel retirar o usuario",
@@ -106,18 +112,19 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Activar o API para compartir",
 "Allow apps to use the Share API" => "Permitir que os aplicativos empreguen o API para compartir",
 "Allow links" => "Permitir ligazóns",
-"Allow users to share items to the public with links" => "Permitir que os usuarios compartan elementos ao público con ligazóns",
+"Enforce password protection" => "Forzar a protección por contrasinal",
 "Allow public uploads" => "Permitir os envíos públicos",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir que os usuarios lle permitan a outros enviar aos seus cartafoles compartidos publicamente",
+"Set default expiration date" => "Definir a data predeterminada de caducidade",
+"Expire after " => "Caduca após",
+"days" => "días",
+"Enforce expiration date" => "Obrigar a data de caducidade",
+"Allow users to share items to the public with links" => "Permitir que os usuarios compartan elementos ao público con ligazóns",
 "Allow resharing" => "Permitir compartir",
 "Allow users to share items shared with them again" => "Permitir que os usuarios compartan de novo os elementos compartidos con eles",
 "Allow users to share with anyone" => "Permitir que os usuarios compartan con calquera",
 "Allow users to only share with users in their groups" => "Permitir que os usuarios compartan só cos usuarios dos seus grupos",
 "Allow mail notification" => "Permitir o envío de notificacións por correo",
 "Allow users to send mail notification for shared files" => "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos",
-"Expire after " => "Caduca após",
-"days" => "días",
-"Expire shares by default after N days" => "As comparticións, de xeito predeterminado, caducan aos N días",
 "Security" => "Seguranza",
 "Enforce HTTPS" => "Forzar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forzar que os clientes se conecten a %s empregando unha conexión cifrada.",
@@ -174,11 +181,12 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Escolla unha imaxe para o perfil",
 "Language" => "Idioma",
 "Help translate" => "Axude na tradución",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Empregue esta ligazón  <a href=\"%s\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "O aplicativo de cifrado non está activado, descifre todos os ficheiros",
 "Log-in password" => "Contrasinal de acceso",
 "Decrypt all Files" => "Descifrar todos os ficheiros",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros.",
+"Restore Encryption Keys" => "Restaurar as chaves de cifrado",
+"Delete Encryption Keys" => "Eliminar as chaves de cifrado",
 "Login Name" => "Nome de acceso",
 "Create" => "Crear",
 "Admin Recovery Password" => "Contrasinal de recuperación do administrador",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 0b42c2167a..b5e80155b8 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -91,7 +91,6 @@ $TRANSLATIONS = array(
 "Cancel" => "ביטול",
 "Language" => "פה",
 "Help translate" => "עזרה בתרגום",
-"WebDAV" => "WebDAV",
 "Login Name" => "שם כניסה",
 "Create" => "יצירה",
 "Admin Recovery Password" => "ססמת השחזור של המנהל",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index a4133dbe40..9cca337704 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Elmentve",
+"test email settings" => "Teszt email beállítások",
+"If you received this email, the settings seem to be correct." => "Amennyiben megérkezett ez az email akkor a beállítások megfelelők",
 "Email sent" => "Az emailt elküldtük",
 "Encryption" => "Titkosítás",
 "Unable to load list from App Store" => "Nem tölthető le a lista az App Store-ból",
@@ -37,6 +40,11 @@ $TRANSLATIONS = array(
 "Update" => "Frissítés",
 "Updated" => "Frissítve",
 "Select a profile picture" => "Válassz profil képet",
+"Very weak password" => "Nagyon gyenge jelszó",
+"Weak password" => "Gyenge jelszó",
+"So-so password" => "Nem túl jó jelszó",
+"Good password" => "Jó jelszó",
+"Strong password" => "Erős jelszó",
 "Decrypting files... Please wait, this can take some time." => "File-ok kititkosítása folyamatban... Kérlek várj, ez hosszabb ideig is eltarthat ...",
 "deleted" => "törölve",
 "undo" => "visszavonás",
@@ -81,9 +89,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "A megosztás API-jának engedélyezése",
 "Allow apps to use the Share API" => "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást",
 "Allow links" => "Linkek engedélyezése",
-"Allow users to share items to the public with links" => "Lehetővé teszi, hogy a felhasználók linkek segítségével külsősökkel is megoszthassák az adataikat",
 "Allow public uploads" => "Feltöltést engedélyezése mindenki számára",
-"Allow users to enable others to upload into their publicly shared folders" => "Engedélyezni a felhasználóknak, hogy beállíithassák, hogy mások feltölthetnek a nyilvánosan megosztott mappákba.",
+"Allow users to share items to the public with links" => "Lehetővé teszi, hogy a felhasználók linkek segítségével külsősökkel is megoszthassák az adataikat",
 "Allow resharing" => "A továbbosztás engedélyezése",
 "Allow users to share items shared with them again" => "Lehetővé teszi, hogy a felhasználók a velük megosztott állományokat megosszák egy további, harmadik féllel",
 "Allow users to share with anyone" => "A felhasználók bárkivel megoszthatják állományaikat",
@@ -134,8 +141,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Válassz profil képet",
 "Language" => "Nyelv",
 "Help translate" => "Segítsen a fordításban!",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Ezt a címet használd, hogy <a href=\"%s\" target=\"_blank\">hozzáférj a fileokhoz WebDAV-on keresztül</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "A titkosító alkalmazás továbbiakban nem lesz engedélyezve, szüntesd meg a titkosítását a file-jaidnak.",
 "Log-in password" => "Bejelentkezési jelszó",
 "Decrypt all Files" => "Kititkosítja az összes file-t",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 07c46a673d..ac6cd5cae5 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Disimpan",
 "Email sent" => "Email terkirim",
 "Encryption" => "Enkripsi",
 "Unable to load list from App Store" => "Tidak dapat memuat daftar dari App Store",
@@ -36,6 +37,11 @@ $TRANSLATIONS = array(
 "Update" => "Perbarui",
 "Updated" => "Diperbarui",
 "Select a profile picture" => "Pilih foto profil",
+"Very weak password" => "Sandi sangat lemah",
+"Weak password" => "Sandi lemah",
+"So-so password" => "Sandi lumayan",
+"Good password" => "Sandi baik",
+"Strong password" => "Sandi kuat",
 "Decrypting files... Please wait, this can take some time." => "Mendeskripsi berkas... Modon tunggu, ini memerlukan beberapa saat.",
 "deleted" => "dihapus",
 "undo" => "urungkan",
@@ -79,9 +85,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Aktifkan API Pembagian",
 "Allow apps to use the Share API" => "Izinkan aplikasi untuk menggunakan API Pembagian",
 "Allow links" => "Izinkan tautan",
-"Allow users to share items to the public with links" => "Izinkan pengguna untuk berbagi item kepada publik lewat tautan",
 "Allow public uploads" => "Izinkan unggahan publik",
-"Allow users to enable others to upload into their publicly shared folders" => "Izinkan pengguna memungkinkan orang lain untuk mengunggah kedalam folder berbagi publik mereka",
+"Allow users to share items to the public with links" => "Izinkan pengguna untuk berbagi item kepada publik lewat tautan",
 "Allow resharing" => "Izinkan pembagian ulang",
 "Allow users to share items shared with them again" => "Izinkan pengguna untuk berbagi kembali item yang dibagikan kepada mereka.",
 "Allow users to share with anyone" => "Izinkan pengguna untuk berbagi kepada siapa saja",
@@ -131,8 +136,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Pilih sebagai gambar profil",
 "Language" => "Bahasa",
 "Help translate" => "Bantu menerjemahkan",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses Berkas via WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda",
 "Log-in password" => "Sandi masuk",
 "Decrypt all Files" => "Deskripsi semua Berkas",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index 3f8b5accda..fc29605313 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -58,7 +58,6 @@ $TRANSLATIONS = array(
 "Cancel" => "Hætta við",
 "Language" => "Tungumál",
 "Help translate" => "Hjálpa við þýðingu",
-"WebDAV" => "WebDAV",
 "Create" => "Búa til",
 "Default Storage" => "Sjálfgefin gagnageymsla",
 "Unlimited" => "Ótakmarkað",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 4e2d4c3d6d..69bfaffa1a 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "File decifrato correttamente",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chiedi al tuo amministratore",
 "Couldn't decrypt your files, check your password and try again" => "Impossibile decifrare i tuoi file, controlla la password e prova ancora",
+"Encryption keys deleted permanently" => "Chiavi di cifratura eliminate definitivamente",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Impossibile eliminare definitivamente le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
 "Email saved" => "Email salvata",
 "Invalid email" => "Email non valida",
 "Unable to delete group" => "Impossibile eliminare il gruppo",
 "Unable to delete user" => "Impossibile eliminare l'utente",
+"Backups restored successfully" => "Copie di sicurezza ripristinate correttamente",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Impossibile ripristinare le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
 "Language changed" => "Lingua modificata",
 "Invalid request" => "Richiesta non valida",
 "Admins can't remove themself from the admin group" => "Gli amministratori non possono rimuovere se stessi dal gruppo di amministrazione",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
 "Good password" => "Password buona",
 "Strong password" => "Password forte",
 "Decrypting files... Please wait, this can take some time." => "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
+"Delete encryption keys permanently." => "Elimina definitivamente le chiavi di cifratura.",
+"Restore encryption keys." => "Ripristina le chiavi di cifratura.",
 "deleted" => "eliminati",
 "undo" => "annulla",
 "Unable to remove user" => "Impossibile rimuovere l'utente",
@@ -106,18 +112,19 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Abilita API di condivisione",
 "Allow apps to use the Share API" => "Consenti alle applicazioni di utilizzare le API di condivisione",
 "Allow links" => "Consenti collegamenti",
-"Allow users to share items to the public with links" => "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti",
+"Enforce password protection" => "Imponi la protezione con password",
 "Allow public uploads" => "Consenti caricamenti pubblici",
-"Allow users to enable others to upload into their publicly shared folders" => "Consenti agli utenti di abilitare altri al caricamento nelle loro cartelle pubbliche condivise",
+"Set default expiration date" => "Imposta data di scadenza predefinita",
+"Expire after " => "Scadenza dopo",
+"days" => "giorni",
+"Enforce expiration date" => "Forza la data di scadenza",
+"Allow users to share items to the public with links" => "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti",
 "Allow resharing" => "Consenti la ri-condivisione",
 "Allow users to share items shared with them again" => "Consenti agli utenti di condividere a loro volta elementi condivisi da altri",
 "Allow users to share with anyone" => "Consenti agli utenti di condividere con chiunque",
 "Allow users to only share with users in their groups" => "Consenti agli utenti di condividere solo con utenti dei loro gruppi",
 "Allow mail notification" => "Consenti le notifiche tramite posta elettronica",
 "Allow users to send mail notification for shared files" => "Consenti agli utenti di inviare email di notifica per i file condivisi",
-"Expire after " => "Scadenza dopo",
-"days" => "giorni",
-"Expire shares by default after N days" => "Le condivisioni scadono in modo predefinito dopo N giorni",
 "Security" => "Protezione",
 "Enforce HTTPS" => "Forza HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forza i client a connettersi a %s tramite una connessione cifrata.",
@@ -174,11 +181,12 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Scegli come immagine del profilo",
 "Language" => "Lingua",
 "Help translate" => "Migliora la traduzione",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\">accedere ai tuoi file con WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file",
 "Log-in password" => "Password di accesso",
 "Decrypt all Files" => "Decifra tutti i file",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Le tue chiavi di cifratura sono state spostate in una posizione sicura. Se qualcosa non dovesse funzionare, potrai ripristinare le chiavi. Eliminale definitivamente solo se sei sicuro che tutti i file siano stati decifrati.",
+"Restore Encryption Keys" => "Ripristina chiavi di cifratura",
+"Delete Encryption Keys" => "Elimina chiavi di cifratura",
 "Login Name" => "Nome utente",
 "Create" => "Crea",
 "Admin Recovery Password" => "Password di ripristino amministrativa",
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
index ec52c74e2a..bf40463550 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -16,10 +16,17 @@ $TRANSLATIONS = array(
 "Unable to change full name" => "フルネームを変更できません",
 "Group already exists" => "グループはすでに存在します",
 "Unable to add group" => "グループを追加できません",
+"Files decrypted successfully" => "ファイルの復号化に成功しました",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "ファイルを復号化することができませんでした。owncloud のログを調査するか、管理者に連絡してください。",
+"Couldn't decrypt your files, check your password and try again" => "ファイルを復号化することができませんでした。パスワードを確認のうえ再試行してください。",
+"Encryption keys deleted permanently" => "暗号化キーは完全に削除されます",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "暗号化キーを完全に削除できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
 "Email saved" => "メールアドレスを保存しました",
 "Invalid email" => "無効なメールアドレス",
 "Unable to delete group" => "グループを削除できません",
 "Unable to delete user" => "ユーザーを削除できません",
+"Backups restored successfully" => "バックアップの復元に成功しました",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "暗号化キーを復元できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
 "Language changed" => "言語が変更されました",
 "Invalid request" => "不正なリクエスト",
 "Admins can't remove themself from the admin group" => "管理者は自身を管理者グループから削除できません。",
@@ -93,6 +100,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." => "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。全ての機能を利用したいのであれば、このサーバーからインターネットに接続できるようにすることをお勧めします。",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "直近では %s に cron が実行されました。",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "直近では %s に cron が実行されました。これは今から１時間以上前なので、なんらかの問題が発生しているようです。",
+"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は、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています",
 "Use systems cron service to call the cron.php file every 15 minutes." => "システムのcronサービスを利用して15分ごとにcron.phpファイルを実行します。",
@@ -100,14 +110,18 @@ $TRANSLATIONS = array(
 "Enable Share API" => "共有APIを有効にする",
 "Allow apps to use the Share API" => "アプリからの共有APIの利用を許可する",
 "Allow links" => "リンクを許可する",
-"Allow users to share items to the public with links" => "ユーザーがリンクによりアイテムを公開することを許可する",
 "Allow public uploads" => "パブリックなアップロードを許可",
-"Allow users to enable others to upload into their publicly shared folders" => "公開している共有フォルダーへのアップロードを共有しているメンバーにも許可",
+"Set default expiration date" => "有効期限の既定値を設定",
+"Expire after " => "無効になるまで",
+"days" => "日",
+"Enforce expiration date" => "有効期限を反映させる",
+"Allow users to share items to the public with links" => "ユーザーがリンクによりアイテムを公開することを許可する",
 "Allow resharing" => "再共有を許可する",
 "Allow users to share items shared with them again" => "ユーザーが共有しているアイテムの再共有を許可する",
 "Allow users to share with anyone" => "ユーザーに誰とでも共有することを許可する",
 "Allow users to only share with users in their groups" => "ユーザーにグループ内のユーザーとのみ共有を許可する",
 "Allow mail notification" => "メール通知を許可",
+"Allow users to send mail notification for shared files" => "共有ファイルに関するメール通知の送信をユーザに許可する",
 "Security" => "セキュリティ",
 "Enforce HTTPS" => "常にHTTPSを使用する",
 "Forces the clients to connect to %s via an encrypted connection." => "クライアントから %sへの接続を常に暗号化します。",
@@ -164,11 +178,12 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "プロファイル画像として選択",
 "Language" => "言語",
 "Help translate" => "翻訳に協力する",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">WebDAV 経由でファイルにアクセス</a> するにはこのアドレスを利用してください",
 "The encryption app is no longer enabled, please decrypt all your files" => "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
 "Log-in password" => "ログインパスワード",
 "Decrypt all Files" => "すべてのファイルを複合する",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "暗号化キーはバックアップ場所に移動されました。何か問題があった場合は、キーを復元することができます。すべてのファイルが正しく復号化されたことが確信できる場合にのみ、キーを完全に削除してください。",
+"Restore Encryption Keys" => "暗号化キーを復元する",
+"Delete Encryption Keys" => "暗号化キーを削除する",
 "Login Name" => "ログイン名",
 "Create" => "作成",
 "Admin Recovery Password" => "管理者リカバリパスワード",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index 88f6ef514d..b11d622712 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -92,7 +92,6 @@ $TRANSLATIONS = array(
 "Cancel" => "უარყოფა",
 "Language" => "ენა",
 "Help translate" => "თარგმნის დახმარება",
-"WebDAV" => "WebDAV",
 "Login Name" => "მომხმარებლის სახელი",
 "Create" => "შექმნა",
 "Default Storage" => "საწყისი საცავი",
diff --git a/settings/l10n/km.php b/settings/l10n/km.php
index 679c7cd390..0bf073001e 100644
--- a/settings/l10n/km.php
+++ b/settings/l10n/km.php
@@ -1,6 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"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" => "បាន​ផ្ញើ​អ៊ីមែល",
+"You need to set your user email before being able to send test emails." => "អ្នក​ត្រូវ​តែ​កំណត់​អ៊ីមែល​របស់​អ្នក​មុន​នឹង​អាច​ផ្ញើ​អ៊ីមែល​សាកល្បង​បាន។",
 "Encryption" => "កូដនីយកម្ម",
 "Unable to load list from App Store" => "មិនអាចផ្ទុកបញ្ជីកម្មវិធីពី App Store",
 "Authentication error" => "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
@@ -16,7 +21,10 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "មិន​អាច​បន្ថែម​អ្នក​ប្រើ​ទៅ​ក្រុម %s",
 "Unable to remove user from group %s" => "មិន​អាច​ដក​អ្នក​ប្រើ​ចេញ​ពី​ក្រុម​ %s",
 "Couldn't update app." => "មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី។",
+"Wrong password" => "ខុស​ពាក្យ​សម្ងាត់",
+"Sending..." => "កំពុង​ផ្ញើ...",
 "User Documentation" => "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់",
+"Admin Documentation" => "កម្រង​ឯកសារ​អភិបាល",
 "Update to {appversion}" => "ធ្វើ​បច្ចុប្បន្នភាព​ទៅ {appversion}",
 "Disable" => "បិទ",
 "Enable" => "បើក",
@@ -26,6 +34,12 @@ $TRANSLATIONS = array(
 "Error" => "កំហុស",
 "Update" => "ធ្វើ​បច្ចុប្បន្នភាព",
 "Updated" => "បាន​ធ្វើ​បច្ចុប្បន្នភាព",
+"Select a profile picture" => "ជ្រើស​រូបភាព​ប្រវត្តិរូប",
+"Very weak password" => "ពាក្យ​សម្ងាត់​ខ្សោយ​ណាស់",
+"Weak password" => "ពាក្យ​សម្ងាត់​ខ្សោយ",
+"So-so password" => "ពាក្យ​សម្ងាត់​ធម្មតា",
+"Good password" => "ពាក្យ​សម្ងាត់​ល្អ",
+"Strong password" => "ពាក្យ​សម្ងាត់​ខ្លាំង",
 "deleted" => "បាន​លុប",
 "undo" => "មិន​ធ្វើ​វិញ",
 "Unable to remove user" => "មិន​អាច​ដក​អ្នក​ប្រើ​ចេញ",
@@ -37,7 +51,10 @@ $TRANSLATIONS = array(
 "Error creating user" => "មាន​កំហុស​ក្នុង​ការ​បង្កើត​អ្នក​ប្រើ",
 "A valid password must be provided" => "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
 "__language_name__" => "__language_name__",
+"None" => "គ្មាន",
 "Login" => "ចូល",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "បម្រាម​សុវត្ថិភាព",
 "Setup Warning" => "បម្រាម​ការ​ដំឡើង",
 "Module 'fileinfo' missing" => "ខ្វះ​ម៉ូឌុល 'fileinfo'",
@@ -48,12 +65,17 @@ $TRANSLATIONS = array(
 "Enable Share API" => "បើក API ចែក​រំលែក",
 "Allow apps to use the Share API" => "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្រើ API ចែក​រំលែក",
 "Allow links" => "អនុញ្ញាត​តំណ",
+"Allow public uploads" => "អនុញ្ញាត​ការ​ផ្ទុក​ឡើង​ជា​សាធារណៈ",
 "Allow users to share items to the public with links" => "អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ចែក​រំលែក​របស់​ទៅ​សាធារណៈ​ជាមួយ​តំណ",
 "Allow resharing" => "អនុញ្ញាត​ការ​ចែក​រំលែក​ម្ដង​ទៀត",
 "Allow users to share with anyone" => "អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ចែក​រំលែក​ជាមួយ​នរណា​ម្នាក់",
 "Security" => "សុវត្ថិភាព",
 "Enforce HTTPS" => "បង្ខំ HTTPS",
+"Email Server" => "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល",
+"From address" => "ពី​អាសយដ្ឋាន",
 "Server address" => "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ",
+"Port" => "ច្រក",
+"Send email" => "ផ្ញើ​អ៊ីមែល",
 "Log" => "Log",
 "Log level" => "កម្រិត Log",
 "More" => "ច្រើន​ទៀត",
@@ -67,18 +89,29 @@ $TRANSLATIONS = array(
 "Forum" => "វេទិកាពិភាក្សា",
 "Bugtracker" => "Bugtracker",
 "Password" => "ពាក្យសម្ងាត់",
+"Your password was changed" => "ពាក្យ​សម្ងាត់​របស់​អ្នក​ត្រូវ​បាន​ប្ដូរ",
+"Unable to change your password" => "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​របស់​អ្នក​បាន​ទេ",
 "Current password" => "ពាក្យសម្ងាត់​បច្ចុប្បន្ន",
 "New password" => "ពាក្យ​សម្ងាត់​ថ្មី",
 "Change password" => "ប្តូរ​ពាក្យសម្ងាត់",
 "Email" => "អ៊ីមែល",
 "Your email address" => "អ៊ីម៉ែល​របស់​អ្នក",
+"Profile picture" => "រូបភាព​ប្រវត្តិរូប",
+"Upload new" => "ផ្ទុកឡើង​ថ្មី",
+"Select new from Files" => "ជ្រើស​ថ្មី​ពី​ឯកសារ",
+"Remove image" => "ដក​រូបភាព​ចេញ",
 "Cancel" => "លើកលែង",
 "Language" => "ភាសា",
 "Help translate" => "ជួយ​បក​ប្រែ",
-"WebDAV" => "WebDAV",
+"Log-in password" => "ពាក្យ​សម្ងាត់​ចូល​គណនី",
 "Login Name" => "ចូល",
 "Create" => "បង្កើត",
+"Default Storage" => "ឃ្លាំង​ផ្ទុក​លំនាំ​ដើម",
+"Unlimited" => "មិន​កំណត់",
 "Other" => "ផ្សេងៗ",
-"Username" => "ឈ្មោះ​អ្នកប្រើ"
+"Username" => "ឈ្មោះ​អ្នកប្រើ",
+"Storage" => "ឃ្លាំង​ផ្ទុក",
+"set new password" => "កំណត់​ពាក្យ​សម្ងាត់​ថ្មី",
+"Default" => "លំនាំ​ដើម"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index b17a25e4c3..f8319249d4 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "저장됨",
 "Email sent" => "이메일 발송됨",
 "Encryption" => "암호화",
 "Unable to load list from App Store" => "앱 스토어에서 목록을 가져올 수 없습니다",
@@ -90,9 +91,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "공유 API 사용하기",
 "Allow apps to use the Share API" => "앱에서 공유 API를 사용할 수 있도록 허용",
 "Allow links" => "링크 허용",
-"Allow users to share items to the public with links" => "사용자가 개별 항목의 링크를 공유할 수 있도록 허용",
 "Allow public uploads" => "공개 업로드 허용",
-"Allow users to enable others to upload into their publicly shared folders" => "다른 사용자들이 공개된 공유 폴더에 파일 업로드 허용",
+"Allow users to share items to the public with links" => "사용자가 개별 항목의 링크를 공유할 수 있도록 허용",
 "Allow resharing" => "재공유 허용",
 "Allow users to share items shared with them again" => "사용자에게 공유된 항목을 다시 공유할 수 있도록 허용",
 "Allow users to share with anyone" => "누구나와 공유할 수 있도록 허용",
@@ -151,8 +151,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "프로필 이미지로 사용",
 "Language" => "언어",
 "Help translate" => "번역 돕기",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "WebDAV로 파일에 접근하려면 <a href=\"%s\" target=\"_blank\">이 주소를 사용하십시오</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다.",
 "Log-in password" => "로그인 암호",
 "Decrypt all Files" => "모든 파일 복호화",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 2e7036aaae..45728392c4 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -69,9 +69,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Įjungti Share API",
 "Allow apps to use the Share API" => "Leidžia programoms naudoti Share API",
 "Allow links" => "Lesti nuorodas",
-"Allow users to share items to the public with links" => "Leisti naudotojams viešai dalintis elementais su nuorodomis",
 "Allow public uploads" => "Leisti viešus įkėlimus",
-"Allow users to enable others to upload into their publicly shared folders" => "Leisti naudotojams įgalinti kitus įkelti į savo viešai dalinamus aplankus",
+"Allow users to share items to the public with links" => "Leisti naudotojams viešai dalintis elementais su nuorodomis",
 "Allow resharing" => "Leisti dalintis",
 "Allow users to share items shared with them again" => "Leisti naudotojams toliau dalintis elementais pasidalintais su jais",
 "Allow users to share with anyone" => "Leisti naudotojams dalintis su bet kuo",
@@ -120,8 +119,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Pasirinkite profilio paveiksliuką",
 "Language" => "Kalba",
 "Help translate" => "Padėkite išversti",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Naudokite šį adresą, kad <a href=\"%s\" target=\"_blank\">pasiektumėte savo failus per WebDAV</a>",
 "Log-in password" => "Prisijungimo slaptažodis",
 "Decrypt all Files" => "Iššifruoti visus failus",
 "Login Name" => "Vartotojo vardas",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 7d5f964a96..261f5a6d37 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -56,9 +56,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Aktivēt koplietošanas API",
 "Allow apps to use the Share API" => "Ļauj lietotnēm izmantot koplietošanas API",
 "Allow links" => "Atļaut saites",
-"Allow users to share items to the public with links" => "Ļaut lietotājiem publiski dalīties ar vienumiem, izmantojot saites",
 "Allow public uploads" => "Atļaut publisko augšupielādi",
-"Allow users to enable others to upload into their publicly shared folders" => "Ļaut lietotājiem iespējot atļaut citiem augšupielādēt failus viņu publiskajās mapēs",
+"Allow users to share items to the public with links" => "Ļaut lietotājiem publiski dalīties ar vienumiem, izmantojot saites",
 "Allow resharing" => "Atļaut atkārtotu koplietošanu",
 "Allow users to share items shared with them again" => "Ļaut lietotājiem dalīties ar vienumiem atkārtoti",
 "Allow users to share with anyone" => "Ļaut lietotājiem dalīties ar visiem",
@@ -100,7 +99,6 @@ $TRANSLATIONS = array(
 "Cancel" => "Atcelt",
 "Language" => "Valoda",
 "Help translate" => "Palīdzi tulkot",
-"WebDAV" => "WebDAV",
 "Log-in password" => "Pieslēgšanās parole",
 "Decrypt all Files" => "Atšifrēt visus failus",
 "Login Name" => "Ierakstīšanās vārds",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 975079eb39..27bdcc7304 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -95,7 +95,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Одбери фотографија за профилот",
 "Language" => "Јазик",
 "Help translate" => "Помогни во преводот",
-"WebDAV" => "WebDAV",
 "Log-in password" => "Лозинка за најавување",
 "Decrypt all Files" => "Дешифрирај ги сите датотеки",
 "Login Name" => "Име за најава",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index a43bde76bc..cfc56d69fb 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -89,9 +89,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Aktiver API for Deling",
 "Allow apps to use the Share API" => "Tillat apps å bruke API for Deling",
 "Allow links" => "Tillat lenker",
-"Allow users to share items to the public with links" => "Tillat brukere å dele filer offentlig med lenker",
 "Allow public uploads" => "Tillat offentlig opplasting",
-"Allow users to enable others to upload into their publicly shared folders" => "Tillat at brukere lar andre laste opp til deres offentlig delte mapper",
+"Allow users to share items to the public with links" => "Tillat brukere å dele filer offentlig med lenker",
 "Allow resharing" => "TIllat videredeling",
 "Allow users to share items shared with them again" => "Tillat brukere å dele filer som allerede har blitt delt med dem",
 "Allow users to share with anyone" => "Tillat brukere å dele med alle",
@@ -146,8 +145,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Velg som profilbilde",
 "Language" => "Språk",
 "Help translate" => "Bidra til oversettelsen",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Bruk denne adressen for å <a href=\"%s\" target=\"_blank\">aksessere filene dine via WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "Krypterings-appen er ikke aktiv lenger. Vennligst dekrypter alle filene dine",
 "Log-in password" => "Innloggingspassord",
 "Decrypt all Files" => "Dekrypter alle filer",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 5cc183beab..5c46be19f9 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "Bestanden succesvol ontsleuteld",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag het uw beheerder",
 "Couldn't decrypt your files, check your password and try again" => "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw",
+"Encryption keys deleted permanently" => "Cryptosleutels permanent verwijderd",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud.log, of neem contact op met uw beheerder.",
 "Email saved" => "E-mail bewaard",
 "Invalid email" => "Ongeldige e-mail",
 "Unable to delete group" => "Niet in staat om groep te verwijderen",
 "Unable to delete user" => "Niet in staat om gebruiker te verwijderen",
+"Backups restored successfully" => "Backup succesvol terggezet",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Kon uw cryptosleutels niet herstellen. Controleer uw owncloud.log of neem contact op met uw beheerder",
 "Language changed" => "Taal aangepast",
 "Invalid request" => "Ongeldige aanvraag",
 "Admins can't remove themself from the admin group" => "Admins kunnen zichzelf niet uit de admin groep verwijderen",
@@ -106,9 +110,12 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Activeren Share API",
 "Allow apps to use the Share API" => "Apps toestaan de Share API te gebruiken",
 "Allow links" => "Toestaan links",
-"Allow users to share items to the public with links" => "Toestaan dat gebruikers objecten met links delen met anderen",
 "Allow public uploads" => "Sta publieke uploads toe",
-"Allow users to enable others to upload into their publicly shared folders" => "Sta gebruikers toe anderen in hun publiek gedeelde mappen bestanden te uploaden",
+"Set default expiration date" => "Stel standaard vervaldatum in",
+"Expire after " => "Vervalt na",
+"days" => "dagen",
+"Enforce expiration date" => "Verplicht de vervaldatum",
+"Allow users to share items to the public with links" => "Toestaan dat gebruikers objecten met links delen met anderen",
 "Allow resharing" => "Toestaan opnieuw delen",
 "Allow users to share items shared with them again" => "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen",
 "Allow users to share with anyone" => "Toestaan dat gebruikers met iedereen delen",
@@ -171,11 +178,12 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Kies als profielafbeelding",
 "Language" => "Taal",
 "Help translate" => "Help met vertalen",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Gebruik deze link <a href=\"%s\" target=\"_blank\">om uw bestanden via WebDAV te benaderen</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "De crypto app is niet langer geactiveerd, u moet alle bestanden decrypten.",
 "Log-in password" => "Inlog-wachtwoord",
 "Decrypt all Files" => "Decodeer alle bestanden",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Uw cryptosleutels zijn verplaatst naar een backup locatie. Als iets iets verkeerd ging, kunt u de sleutels herstellen. Verwijder ze alleen permanent als u zeker weet dat de bestanden goed zijn versleuteld.",
+"Restore Encryption Keys" => "Herstel cryptosleutels",
+"Delete Encryption Keys" => "Verwijder cryptosleutels",
 "Login Name" => "Inlognaam",
 "Create" => "Aanmaken",
 "Admin Recovery Password" => "Beheer herstel wachtwoord",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 7eacdbedfb..c064d66c70 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -64,9 +64,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Slå på API-et for deling",
 "Allow apps to use the Share API" => "La app-ar bruka API-et til deling",
 "Allow links" => "Tillat lenkjer",
-"Allow users to share items to the public with links" => "La brukarar dela ting offentleg med lenkjer",
 "Allow public uploads" => "Tillat offentlege opplastingar",
-"Allow users to enable others to upload into their publicly shared folders" => "La brukarar tillata andre å lasta opp i deira offentleg delte mapper",
+"Allow users to share items to the public with links" => "La brukarar dela ting offentleg med lenkjer",
 "Allow resharing" => "Tillat vidaredeling",
 "Allow users to share items shared with them again" => "La brukarar vidaredela delte ting",
 "Allow users to share with anyone" => "La brukarar dela med kven som helst",
@@ -112,7 +111,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Vel som profilbilete",
 "Language" => "Språk",
 "Help translate" => "Hjelp oss å omsetja",
-"WebDAV" => "WebDAV",
 "Log-in password" => "Innloggingspassord",
 "Decrypt all Files" => "Dekrypter alle filene",
 "Login Name" => "Innloggingsnamn",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 88fdd667d5..daec563be9 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "Pliki zostały poprawnie zdeszyfrowane",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nie można zdeszyfrować Twoich plików, proszę sprawdzić owncloud.log lub zapytać administratora",
 "Couldn't decrypt your files, check your password and try again" => "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie",
+"Encryption keys deleted permanently" => "Klucze szyfrujące zostały trwale usunięte",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź owncloud.log lub zapytaj administratora",
 "Email saved" => "E-mail zapisany",
 "Invalid email" => "Nieprawidłowy e-mail",
 "Unable to delete group" => "Nie można usunąć grupy",
 "Unable to delete user" => "Nie można usunąć użytkownika",
+"Backups restored successfully" => "Archiwum zostało prawidłowo przywrócone",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nie można przywrócić kluczy szyfrujących, proszę sprawdzić owncloud.log lub zapytać administratora",
 "Language changed" => "Zmieniono język",
 "Invalid request" => "Nieprawidłowe żądanie",
 "Admins can't remove themself from the admin group" => "Administratorzy nie mogą usunąć siebie samych z grupy administratorów",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
 "Good password" => "Dobre hasło",
 "Strong password" => "Mocne hasło",
 "Decrypting files... Please wait, this can take some time." => "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
+"Delete encryption keys permanently." => "Usuń trwale klucze szyfrujące.",
+"Restore encryption keys." => "Przywróć klucze szyfrujące.",
 "deleted" => "usunięto",
 "undo" => "cofnij",
 "Unable to remove user" => "Nie można usunąć użytkownika",
@@ -106,9 +112,12 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Włącz API udostępniania",
 "Allow apps to use the Share API" => "Zezwalaj aplikacjom na korzystanie z API udostępniania",
 "Allow links" => "Zezwalaj na odnośniki",
-"Allow users to share items to the public with links" => "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników",
 "Allow public uploads" => "Pozwól na  publiczne wczytywanie",
-"Allow users to enable others to upload into their publicly shared folders" => "Użytkownicy mogą włączyć dla innych wgrywanie do ich publicznych katalogów",
+"Set default expiration date" => "Ustaw domyślną datę wygaśnięcia",
+"Expire after " => "Wygaś po",
+"days" => "dniach",
+"Enforce expiration date" => "Wymuś datę wygaśnięcia",
+"Allow users to share items to the public with links" => "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników",
 "Allow resharing" => "Zezwalaj na ponowne udostępnianie",
 "Allow users to share items shared with them again" => "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych",
 "Allow users to share with anyone" => "Zezwalaj użytkownikom na współdzielenie z kimkolwiek",
@@ -171,11 +180,12 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Wybierz zdjęcie profilu",
 "Language" => "Język",
 "Help translate" => "Pomóż w tłumaczeniu",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Użyj tego adresu do <a href=\"%s\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik",
 "Log-in password" => "Hasło logowania",
 "Decrypt all Files" => "Odszyfruj wszystkie pliki",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Twoje klucze szyfrujące zostały przeniesione do lokalizacji archialnej. Jeśli coś poszło nie tak, możesz je przywrócić. Usuń je trwale tylko, gdy jesteś pewien(na), że wszystkie pliki zostały prawidłowo zdeszyfrowane.",
+"Restore Encryption Keys" => "Przywróć klucze szyfrujące",
+"Delete Encryption Keys" => "Usuń klucze szyfrujące",
 "Login Name" => "Login",
 "Create" => "Utwórz",
 "Admin Recovery Password" => "Odzyskiwanie hasła administratora",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 4a727fb03d..d345a8d14a 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "Arquivos descriptografados com sucesso",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Não foi possível descriptografar os arquivos, verifique a sua owncloud.log ou pergunte ao seu administrador",
 "Couldn't decrypt your files, check your password and try again" => "Não foi possível descriptografar os arquivos, verifique sua senha e tente novamente",
+"Encryption keys deleted permanently" => "Chaves de criptografia excluídas permanentemente",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Não foi possível excluir permanentemente suas chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
 "Email saved" => "E-mail salvo",
 "Invalid email" => "E-mail inválido",
 "Unable to delete group" => "Não foi possível remover grupo",
 "Unable to delete user" => "Não foi possível remover usuário",
+"Backups restored successfully" => "Backup restaurado com sucesso",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Não foi possível salvar as chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
 "Language changed" => "Idioma alterado",
 "Invalid request" => "Pedido inválido",
 "Admins can't remove themself from the admin group" => "Admins não podem ser removidos do grupo admin",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
 "Good password" => "Boa senha",
 "Strong password" => "Senha forte",
 "Decrypting files... Please wait, this can take some time." => "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
+"Delete encryption keys permanently." => "Eliminando a chave de criptografia permanentemente.",
+"Restore encryption keys." => "Restaurar chave de criptografia.",
 "deleted" => "excluído",
 "undo" => "desfazer",
 "Unable to remove user" => "Impossível remover usuário",
@@ -106,18 +112,19 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Habilitar API de Compartilhamento",
 "Allow apps to use the Share API" => "Permitir que aplicativos usem a API de Compartilhamento",
 "Allow links" => "Permitir links",
-"Allow users to share items to the public with links" => "Permitir que usuários compartilhem itens com o público usando links",
+"Enforce password protection" => "Reforce a proteção por senha",
 "Allow public uploads" => "Permitir envio público",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir que usuários deem permissão a outros para enviarem arquivios para suas pastas compartilhadas publicamente",
+"Set default expiration date" => "Configurar a data de expiração",
+"Expire after " => "Expirar depois de",
+"days" => "dias",
+"Enforce expiration date" => "Fazer cumprir a data de expiração",
+"Allow users to share items to the public with links" => "Permitir que usuários compartilhem itens com o público usando links",
 "Allow resharing" => "Permitir recompartilhamento",
 "Allow users to share items shared with them again" => "Permitir que usuários compartilhem novamente itens compartilhados com eles",
 "Allow users to share with anyone" => "Permitir que usuários compartilhem com qualquer um",
 "Allow users to only share with users in their groups" => "Permitir que usuários compartilhem somente com usuários em seus grupos",
 "Allow mail notification" => "Permitir notificação por email",
 "Allow users to send mail notification for shared files" => "Permitir aos usuários enviar notificação de email para arquivos compartilhados",
-"Expire after " => "Expirar depois de",
-"days" => "dias",
-"Expire shares by default after N days" => "Expirar compartilhamentos automaticamente depois de N dias",
 "Security" => "Segurança",
 "Enforce HTTPS" => "Forçar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Obrigar os clientes que se conectem a %s através de uma conexão criptografada.",
@@ -174,11 +181,12 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Escolha como imagem para o perfil",
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso a seus Arquivos via WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "O aplicativo de criptografia não está habilitado, por favor descriptar todos os seus arquivos",
 "Log-in password" => "Senha de login",
 "Decrypt all Files" => "Decripti todos os Arquivos",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Suas chaves de criptografia forão movidas para o local de backup. Se alguma coisa deu errado, você pode salvar as chaves. Só excluí-las permanentemente se você tiver certeza de que  todos os arquivos forão descriptografados corretamente.",
+"Restore Encryption Keys" => "Restaurar Chaves de Criptografia",
+"Delete Encryption Keys" => "Eliminar Chaves de Criptografia",
 "Login Name" => "Nome de Login",
 "Create" => "Criar",
 "Admin Recovery Password" => "Recuperação da Senha do Administrador",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index e4f34141ab..43d24cfe8e 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,20 +1,32 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Valor dado a %s éinválido",
 "Saved" => "Guardado",
 "test email settings" => "testar configurações de email",
+"If you received this email, the settings seem to be correct." => "Se você recebeu este e-mail as configurações parecem estar correctas",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Ocorreu um erro ao enviar o email. Por favor verifique as definições.",
 "Email sent" => "E-mail enviado",
+"You need to set your user email before being able to send test emails." => "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste",
 "Send mode" => "Modo de envio",
 "Encryption" => "Encriptação",
+"Authentication method" => "Método de autenticação",
 "Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
 "Authentication error" => "Erro na autenticação",
 "Your full name has been changed." => "O seu nome completo foi alterado.",
 "Unable to change full name" => "Não foi possível alterar o seu nome completo",
 "Group already exists" => "O grupo já existe",
 "Unable to add group" => "Impossível acrescentar o grupo",
+"Files decrypted successfully" => "Ficheiros desencriptados com sucesso",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Não foi possível desencriptar os seus arquivos. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+"Couldn't decrypt your files, check your password and try again" => "Não foi possível desencriptar os seus arquivos.  Verifique a sua senha e tente novamente",
+"Encryption keys deleted permanently" => "A chave de encriptação foi eliminada permanentemente",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador",
 "Email saved" => "Email guardado",
 "Invalid email" => "Email inválido",
 "Unable to delete group" => "Impossível apagar grupo",
 "Unable to delete user" => "Impossível apagar utilizador",
+"Backups restored successfully" => "Cópias de segurança foram restauradas com sucesso",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nao foi possivel restaurar as suas chaves de encriptacao. Verifique a sua owncloud.log ou pergunte ao seu administrador",
 "Language changed" => "Idioma alterado",
 "Invalid request" => "Pedido Inválido",
 "Admins can't remove themself from the admin group" => "Os administradores não se podem remover a eles mesmos do grupo admin.",
@@ -29,6 +41,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Não foi possível alterar a sua password",
 "Sending..." => "A enviar...",
 "User Documentation" => "Documentação de Utilizador",
+"Admin Documentation" => "Documentação de administrador.",
 "Update to {appversion}" => "Actualizar para a versão {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
@@ -41,6 +54,11 @@ $TRANSLATIONS = array(
 "Update" => "Actualizar",
 "Updated" => "Actualizado",
 "Select a profile picture" => "Seleccione uma fotografia de perfil",
+"Very weak password" => "Password muito fraca",
+"Weak password" => "Password fraca",
+"So-so password" => "Password aceitável",
+"Good password" => "Password Forte",
+"Strong password" => "Password muito forte",
 "Decrypting files... Please wait, this can take some time." => "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
 "deleted" => "apagado",
 "undo" => "desfazer",
@@ -61,6 +79,8 @@ $TRANSLATIONS = array(
 "Fatal issues only" => "Apenas problemas fatais",
 "None" => "Nenhum",
 "Login" => "Login",
+"Plain" => "Plano",
+"NT LAN Manager" => "Gestor de NT LAN",
 "SSL" => "SSL",
 "TLS" => "TLS",
 "Security Warning" => "Aviso de Segurança",
@@ -80,6 +100,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "A ligação à internet não está a funcionar",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Este servidor ownCloud não tem uma ligação de internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretender obter todas as funcionalidades do ownCloud.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "O ultimo cron foi executado em %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "O ultima cron foi executado em %s a mais duma hora. Algo não está certo.",
+"Cron was not executed yet!" => "Cron ainda não foi executado!",
 "Execute one task with each page loaded" => "Executar 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á registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Use o serviço cron do sistema para chamar o ficheiro cron.php a cada 15 minutos.",
@@ -87,14 +110,18 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Activar a API de partilha",
 "Allow apps to use the Share API" => "Permitir que os utilizadores usem a API de partilha",
 "Allow links" => "Permitir links",
-"Allow users to share items to the public with links" => "Permitir que os utilizadores partilhem itens com o público utilizando um link.",
 "Allow public uploads" => "Permitir Envios Públicos",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir aos utilizadores que possam definir outros utilizadores para carregar ficheiros para as suas pastas publicas",
+"Set default expiration date" => "Especificar a data padrão de expiração",
+"Expire after " => "Expira após",
+"days" => "dias",
+"Enforce expiration date" => "Forçar a data de expiração",
+"Allow users to share items to the public with links" => "Permitir que os utilizadores partilhem itens com o público utilizando um link.",
 "Allow resharing" => "Permitir repartilha",
 "Allow users to share items shared with them again" => "Permitir que os utilizadores partilhem itens partilhados com eles",
 "Allow users to share with anyone" => "Permitir que os utilizadores partilhem com todos",
 "Allow users to only share with users in their groups" => "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo",
 "Allow mail notification" => "Permitir notificação por email",
+"Allow users to send mail notification for shared files" => "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados",
 "Security" => "Segurança",
 "Enforce HTTPS" => "Forçar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forçar os clientes a ligar a %s através de uma ligação encriptada",
@@ -140,6 +167,7 @@ $TRANSLATIONS = array(
 "Full Name" => "Nome completo",
 "Email" => "Email",
 "Your email address" => "O seu endereço de email",
+"Fill in an email address to enable password recovery and receive notifications" => "Preencha com um endereço e-mail para permitir a recuperação de senha e receber notificações",
 "Profile picture" => "Foto do perfil",
 "Upload new" => "Carregar novo",
 "Select new from Files" => "Seleccionar novo a partir dos ficheiros",
@@ -150,11 +178,12 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Escolha uma fotografia de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros",
 "Log-in password" => "Password de entrada",
 "Decrypt all Files" => "Desencriptar todos os ficheiros",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves.  Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente.",
+"Restore Encryption Keys" => "Restaurar as chaves de encriptação",
+"Delete Encryption Keys" => "Apagar as chaves de encriptação",
 "Login Name" => "Nome de utilizador",
 "Create" => "Criar",
 "Admin Recovery Password" => "Recuperar password de administrador",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 7ada22648d..b16f65324a 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -77,9 +77,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Activare API partajare",
 "Allow apps to use the Share API" => "Permite aplicațiilor să folosească API-ul de partajare",
 "Allow links" => "Pemite legături",
-"Allow users to share items to the public with links" => "Permite utilizatorilor să partajeze fișiere în mod public prin legături",
 "Allow public uploads" => "Permite încărcări publice",
-"Allow users to enable others to upload into their publicly shared folders" => "Permite utilizatorilor sa activeze opțiunea de încărcare a fișierelor în dosarele lor publice de către alte persoane",
+"Allow users to share items to the public with links" => "Permite utilizatorilor să partajeze fișiere în mod public prin legături",
 "Allow resharing" => "Permite repartajarea",
 "Allow users to share items shared with them again" => "Permite utilizatorilor să repartajeze fișiere partajate cu ei",
 "Allow users to share with anyone" => "Permite utilizatorilor să partajeze cu oricine",
@@ -130,8 +129,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Alege drept imagine de profil",
 "Language" => "Limba",
 "Help translate" => "Ajută la traducere",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Folosește această adresă <a href=\"%s\" target=\"_blank\">pentru acces la fișierele tale folosind WebDAV</a>",
 "Log-in password" => "Parolă",
 "Decrypt all Files" => "Decriptează toate fișierele",
 "Login Name" => "Autentificare",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index b0a961df48..fca7168f28 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,8 +1,15 @@
 <?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" => "Письмо отправлено",
+"You need to set your user email before being able to send test emails." => "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения.",
+"Send mode" => "Отправить сообщение",
 "Encryption" => "Шифрование",
+"Authentication method" => "Метод проверки подлинности",
 "Unable to load list from App Store" => "Не удалось загрузить список из App Store",
 "Authentication error" => "Ошибка аутентификации",
 "Your full name has been changed." => "Ваше полное имя было изменено.",
@@ -91,9 +98,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Включить API общего доступа",
 "Allow apps to use the Share API" => "Позволить приложениям использовать API общего доступа",
 "Allow links" => "Разрешить ссылки",
-"Allow users to share items to the public with links" => "Разрешить пользователям открывать в общий доступ элементы с публичной ссылкой",
 "Allow public uploads" => "Разрешить открытые загрузки",
-"Allow users to enable others to upload into their publicly shared folders" => "Разрешить пользователям позволять другим загружать в их открытые папки",
+"Allow users to share items to the public with links" => "Разрешить пользователям открывать в общий доступ элементы с публичной ссылкой",
 "Allow resharing" => "Разрешить переоткрытие общего доступа",
 "Allow users to share items shared with them again" => "Позволить пользователям открывать общий доступ к эллементам уже открытым в общий доступ",
 "Allow users to share with anyone" => "Разрешить пользователя делать общий доступ любому",
@@ -103,11 +109,16 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Принудить к HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Принудить клиентов подключаться к %s через шифрованное соединение.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Пожалуйста, подключитесь к %s используя HTTPS чтобы включить или отключить принудительное SSL.",
+"Email Server" => "Сервер почты",
+"This is used for sending out notifications." => "Используется для отправки уведомлений.",
+"From address" => "Адрес отправителя",
+"Authentication required" => "Требуется аутентификация ",
 "Server address" => "Адрес сервера",
 "Port" => "Порт",
 "Credentials" => "Полномочия",
 "SMTP Username" => "Имя пользователя",
 "SMTP Password" => "Пароль",
+"Test email settings" => "Тест настроек",
 "Send email" => "Отправить сообщение",
 "Log" => "Журнал",
 "Log level" => "Уровень детализации журнала",
@@ -120,6 +131,7 @@ $TRANSLATIONS = array(
 "Select an App" => "Выберите приложение",
 "Documentation:" => "Документация",
 "See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com",
+"See application website" => "См. сайт приложений",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>",
 "Administrator Documentation" => "Документация администратора",
 "Online Documentation" => "Online документация",
@@ -148,8 +160,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Выберите изображение профиля",
 "Language" => "Язык",
 "Help translate" => "Помочь с переводом",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Используйте этот адресс для <a href=\"%s\" target=\"_blank\">доступа к вашим файлам через WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "Приложение для шифрования выключено, пожалуйста, расшифруйте ваши файлы",
 "Log-in password" => "Пароль входа",
 "Decrypt all Files" => "Снять шифрование со всех файлов",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 3468a87ae1..c977985b66 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -104,17 +104,16 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Povoliť API zdieľania",
 "Allow apps to use the Share API" => "Povoliť aplikáciám používať API na zdieľanie",
 "Allow links" => "Povoliť odkazy",
-"Allow users to share items to the public with links" => "Povoliť používateľom zdieľať položky pre verejnosť cez odkazy",
 "Allow public uploads" => "Povoliť verejné nahrávanie súborov",
-"Allow users to enable others to upload into their publicly shared folders" => "Povoliť používateľom umožniť iným používateľom nahrávať do ich zdieľaného priečinka",
+"Expire after " => "Platnosť",
+"days" => "dni",
+"Allow users to share items to the public with links" => "Povoliť používateľom zdieľať položky pre verejnosť cez odkazy",
 "Allow resharing" => "Povoliť zdieľanie ďalej",
 "Allow users to share items shared with them again" => "Povoliť používateľom ďalej zdieľať zdieľané položky",
 "Allow users to share with anyone" => "Povoliť používateľom zdieľať s kýmkoľvek",
 "Allow users to only share with users in their groups" => "Povoliť používateľom zdieľať len s používateľmi v ich skupinách",
 "Allow mail notification" => "Povoliť odosielať upozornenia emailom",
 "Allow users to send mail notification for shared files" => "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov",
-"Expire after " => "Platnosť",
-"days" => "dni",
 "Security" => "Zabezpečenie",
 "Enforce HTTPS" => "Vynútiť HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Vynúti pripájanie klientov k %s šifrovaným pripojením.",
@@ -170,8 +169,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Vybrať ako avatara",
 "Language" => "Jazyk",
 "Help translate" => "Pomôcť s prekladom",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prístup k vašim súborom cez WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "Šifrovacia aplikácia už nie je spustená, dešifrujte všetky svoje súbory.",
 "Log-in password" => "Prihlasovacie heslo",
 "Decrypt all Files" => "Dešifrovať všetky súbory",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index c633d47268..8a2b721844 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -105,9 +105,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Omogoči API souporabe",
 "Allow apps to use the Share API" => "Dovoli programom uporabo vmesnika API souporabe",
 "Allow links" => "Dovoli povezave",
-"Allow users to share items to the public with links" => "Uporabnikom dovoli souporabo predmetov z javnimi povezavami",
 "Allow public uploads" => "Dovoli javno pošiljanje datotek v oblak",
-"Allow users to enable others to upload into their publicly shared folders" => "Dovoli uporabnikom, da omogočijo drugim uporabnikom, pošiljati datoteke v javno mapo.",
+"Allow users to share items to the public with links" => "Uporabnikom dovoli souporabo predmetov z javnimi povezavami",
 "Allow resharing" => "Dovoli nadaljnjo souporabo",
 "Allow users to share items shared with them again" => "Uporabnikom dovoli nadaljnjo souporabo predmetov",
 "Allow users to share with anyone" => "Uporabnikom dovoli souporabo s komerkoli",
@@ -167,8 +166,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Izberi kot sliko profila",
 "Language" => "Jezik",
 "Help translate" => "Sodelujte pri prevajanju",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek rpeko sistema WebDAV</a>.",
 "The encryption app is no longer enabled, please decrypt all your files" => "Program za šifriranje ni več omogočen. Odšifrirati je treba vse datoteke.",
 "Log-in password" => "Prijavno geslo",
 "Decrypt all Files" => "Odšifriraj vse datoteke",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index 29925683c0..ca74ba573c 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -49,9 +49,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Aktivizo API për ndarjet",
 "Allow apps to use the Share API" => "Lejoni aplikacionet të përdorin share API",
 "Allow links" => "Lejo lidhjet",
-"Allow users to share items to the public with links" => "Lejoni përdoruesit të ndajnë elementët publikisht nëpermjet lidhjeve",
 "Allow public uploads" => "Lejo ngarkimin publik",
-"Allow users to enable others to upload into their publicly shared folders" => "Lejo përdoruesit të mundësojnë të tjerët që të ngarkojnë materiale në dosjen e tyre publike",
+"Allow users to share items to the public with links" => "Lejoni përdoruesit të ndajnë elementët publikisht nëpermjet lidhjeve",
 "Allow resharing" => "Lejo ri-ndarjen",
 "Allow users to share items shared with them again" => "Lejoni përdoruesit të ndjanë dhe ata elementë të ndarë më parë ngë të tjerë",
 "Allow users to share with anyone" => "Lejo përdoruesit të ndajnë me cilindo",
@@ -89,7 +88,6 @@ $TRANSLATIONS = array(
 "Cancel" => "Anullo",
 "Language" => "Gjuha",
 "Help translate" => "Ndihmoni në përkthim",
-"WebDAV" => "WebDAV",
 "Login Name" => "Emri i Përdoruesit",
 "Create" => "Krijo",
 "Admin Recovery Password" => "Rigjetja e fjalëkalimit të Admin",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 3723ef3fe5..408e704d40 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -90,7 +90,6 @@ $TRANSLATIONS = array(
 "Cancel" => "Откажи",
 "Language" => "Језик",
 "Help translate" => " Помозите у превођењу",
-"WebDAV" => "WebDAV",
 "Login Name" => "Корисничко име",
 "Create" => "Направи",
 "Default Storage" => "Подразумевано складиште",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index f76eed303b..895360395b 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -19,10 +19,12 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "Filerna dekrypterades utan fel",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log eller fråga administratören",
 "Couldn't decrypt your files, check your password and try again" => "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen",
+"Encryption keys deleted permanently" => "Krypteringsnycklar raderades permanent",
 "Email saved" => "E-post sparad",
 "Invalid email" => "Ogiltig e-post",
 "Unable to delete group" => "Kan inte radera grupp",
 "Unable to delete user" => "Kan inte radera användare",
+"Backups restored successfully" => "Återställning av säkerhetskopior lyckades",
 "Language changed" => "Språk ändrades",
 "Invalid request" => "Ogiltig begäran",
 "Admins can't remove themself from the admin group" => "Administratörer kan inte ta bort sig själva från admingruppen",
@@ -56,6 +58,8 @@ $TRANSLATIONS = array(
 "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.",
+"Delete encryption keys permanently." => "Radera krypteringsnycklar permanent",
+"Restore encryption keys." => "Återställ krypteringsnycklar",
 "deleted" => "raderad",
 "undo" => "ångra",
 "Unable to remove user" => "Kan inte ta bort användare",
@@ -106,18 +110,16 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Aktivera delat API",
 "Allow apps to use the Share API" => "Tillåt applikationer att använda delat API",
 "Allow links" => "Tillåt länkar",
-"Allow users to share items to the public with links" => "Tillåt delning till allmänheten via publika länkar",
 "Allow public uploads" => "Tillåt offentlig uppladdning",
-"Allow users to enable others to upload into their publicly shared folders" => "Tillåt användare att aktivera\nTillåt användare att göra det möjligt för andra att ladda upp till sina offentligt delade mappar",
+"Expire after " => "Förfaller efter",
+"days" => "dagar",
+"Allow users to share items to the public with links" => "Tillåt delning till allmänheten via publika länkar",
 "Allow resharing" => "Tillåt vidaredelning",
 "Allow users to share items shared with them again" => "Tillåt användare att dela vidare filer som delats med dem",
 "Allow users to share with anyone" => "Tillåt delning med alla",
 "Allow users to only share with users in their groups" => "Tillåt bara delning med användare i egna grupper",
 "Allow mail notification" => "Tillåt e-post notifikation",
 "Allow users to send mail notification for shared files" => "Tillåt användare att skicka mailnotifieringar för delade filer",
-"Expire after " => "Förfaller efter",
-"days" => "dagar",
-"Expire shares by default after N days" => "Låt delningar förfalla som standard efter N dagar",
 "Security" => "Säkerhet",
 "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.",
@@ -174,11 +176,11 @@ $TRANSLATIONS = array(
 "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",
+"Restore Encryption Keys" => "Återställ krypteringsnycklar",
+"Delete Encryption Keys" => "Radera krypteringsnycklar",
 "Login Name" => "Inloggningsnamn",
 "Create" => "Skapa",
 "Admin Recovery Password" => "Admin återställningslösenord",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 14000c59ca..f2fa7dd6ea 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -79,7 +79,6 @@ $TRANSLATIONS = array(
 "Cancel" => "ยกเลิก",
 "Language" => "ภาษา",
 "Help translate" => "ช่วยกันแปล",
-"WebDAV" => "WebDAV",
 "Login Name" => "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
 "Create" => "สร้าง",
 "Default Storage" => "พื้นที่จำกัดข้อมูลเริ่มต้น",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 1122184f50..5fbdd9437a 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "Dosya şifresi başarıyla çözüldü",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dosyalarınızın şifresi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin.",
 "Couldn't decrypt your files, check your password and try again" => "Dosyalarınızın şifresi kaldırılamadı, parolanızı denetleyip yeniden deneyin.",
+"Encryption keys deleted permanently" => "Şifreleme anahtarları kalıcı olarak silindi",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Şifreleme anahtarlarınız kalıcı olarak silinemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
 "Email saved" => "E-posta kaydedildi",
 "Invalid email" => "Geçersiz e-posta",
 "Unable to delete group" => "Grup silinemiyor",
 "Unable to delete user" => "Kullanıcı silinemiyor",
+"Backups restored successfully" => "Yedekler başarıyla geri yüklendi",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Şifreleme anahtarlarınız geri yüklenemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
 "Language changed" => "Dil değiştirildi",
 "Invalid request" => "Geçersiz istek",
 "Admins can't remove themself from the admin group" => "Yöneticiler kendilerini admin grubundan kaldıramaz",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
 "Good password" => "İyi parola",
 "Strong password" => "Güçlü parola",
 "Decrypting files... Please wait, this can take some time." => "Dosyaların şifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir.",
+"Delete encryption keys permanently." => "Şifreleme anahtarlarını kalıcı olarak sil.",
+"Restore encryption keys." => "Şifreleme anahtarlarını geri yükle.",
 "deleted" => "silinen:",
 "undo" => "geri al",
 "Unable to remove user" => "Kullanıcı kaldırılamıyor",
@@ -106,18 +112,19 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Paylaşım API'sini etkinleştir",
 "Allow apps to use the Share API" => "Uygulamaların paylaşım API'sini kullanmasına izin ver",
 "Allow links" => "Bağlantılara izin ver",
-"Allow users to share items to the public with links" => "Kullanıcıların ögeleri paylaşması için herkese açık bağlantılara izin ver",
+"Enforce password protection" => "Parola korumasını zorla",
 "Allow public uploads" => "Herkes tarafından yüklemeye izin ver",
-"Allow users to enable others to upload into their publicly shared folders" => "Kullanıcıların, herkese açık dizinlerine, başkalarının dosya yüklemelerini etkinleştirmelerine izin ver",
+"Set default expiration date" => "Öntanımlı son kullanma tarihini ayarla",
+"Expire after " => "Şu süreden sonra süresi dolsun",
+"days" => "gün",
+"Enforce expiration date" => "Son kullanma tarihini zorla",
+"Allow users to share items to the public with links" => "Kullanıcıların ögeleri paylaşması için herkese açık bağlantılara izin ver",
 "Allow resharing" => "Paylaşıma izin ver",
 "Allow users to share items shared with them again" => "Kullanıcıların kendileri ile paylaşılan ögeleri yeniden paylaşmasına izin ver",
 "Allow users to share with anyone" => "Kullanıcıların her şeyi paylaşmalarına izin ver",
 "Allow users to only share with users in their groups" => "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver",
 "Allow mail notification" => "Posta bilgilendirmesine izin ver",
 "Allow users to send mail notification for shared files" => "Paylaşılmış dosyalar için kullanıcıların posta bildirimi göndermesine izin ver",
-"Expire after " => "Şu süreden sonra süresi dolsun",
-"days" => "gün",
-"Expire shares by default after N days" => "Paylaşımların süresini öntanımlı olarak N günden sonra doldur",
 "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.",
@@ -151,7 +158,7 @@ $TRANSLATIONS = array(
 "Forum" => "Forum",
 "Bugtracker" => "Hata Takip Sistemi",
 "Commercial Support" => "Ticari Destek",
-"Get the apps to sync your files" => "Dosyalarınızı eşitlemek için uygulamayı indirin",
+"Get the apps to sync your files" => "Dosyalarınızı eşitlemek için uygulamaları indirin",
 "Show First Run Wizard again" => "İlk Çalıştırma Sihirbazını yeniden göster",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Kullandığınız: <strong>%s</strong>. Kullanılabilir alan: <strong>%s</strong>",
 "Password" => "Parola",
@@ -174,11 +181,12 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Profil resmi olarak seç",
 "Language" => "Dil",
 "Help translate" => "Çevirilere yardım edin",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">Dosyalarınıza WebDAV aracılığıyla erişmek için</a> bu adresi kullanın",
 "The encryption app is no longer enabled, please decrypt all your files" => "Şifreleme uygulaması artık etkin değil, tüm dosyalarınızın şifrelemesini kaldırın",
 "Log-in password" => "Oturum açma parolası",
 "Decrypt all Files" => "Tüm dosyaların şifresini çöz",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın düzgün bir şekilde şifrelerinin çözüldüğünden eminseniz kalıcı olarak silin.",
+"Restore Encryption Keys" => "Şifreleme Anahtarlarını Geri Yükle",
+"Delete Encryption Keys" => "Şifreleme Anahtarlarını Sil",
 "Login Name" => "Giriş Adı",
 "Create" => "Oluştur",
 "Admin Recovery Password" => "Yönetici Kurtarma Parolası",
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index c55834f733..2136f9af1e 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -68,7 +68,6 @@ $TRANSLATIONS = array(
 "Cancel" => "ۋاز كەچ",
 "Language" => "تىل",
 "Help translate" => "تەرجىمىگە ياردەم",
-"WebDAV" => "WebDAV",
 "Login Name" => "تىزىمغا كىرىش ئاتى",
 "Create" => "قۇر",
 "Default Storage" => "كۆڭۈلدىكى ساقلىغۇچ",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 0c8adce29c..a1520a0def 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -96,7 +96,6 @@ $TRANSLATIONS = array(
 "Cancel" => "Відмінити",
 "Language" => "Мова",
 "Help translate" => "Допомогти з перекладом",
-"WebDAV" => "WebDAV",
 "Login Name" => "Ім'я Логіну",
 "Create" => "Створити",
 "Default Storage" => "сховище за замовчуванням",
diff --git a/settings/l10n/ur_PK.php b/settings/l10n/ur_PK.php
index 0144e2b534..76b66e82ee 100644
--- a/settings/l10n/ur_PK.php
+++ b/settings/l10n/ur_PK.php
@@ -1,6 +1,16 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "ارسال شدہ ای میل ",
 "Error" => "ایرر",
+"Very weak password" => "بہت کمزور پاسورڈ",
+"Weak password" => "کمزور پاسورڈ",
+"So-so password" => "نص نص پاسورڈ",
+"Good password" => "اچھا پاسورڈ",
+"Strong password" => "مضبوط پاسورڈ",
+"Delete" => "حذف کریں",
+"Security Warning" => "حفاظتی انتباہ",
+"More" => "مزید",
+"Less" => "کم",
 "Password" => "پاسورڈ",
 "New password" => "نیا پاسورڈ",
 "Cancel" => "منسوخ کریں",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index da9dbdf0a1..ef8c20ef94 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -86,7 +86,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Chọn hình ảnh như hồ sơ cá nhân",
 "Language" => "Ngôn ngữ",
 "Help translate" => "Hỗ trợ dịch thuật",
-"WebDAV" => "WebDAV",
 "Login Name" => "Tên đăng nhập",
 "Create" => "Tạo",
 "Default Storage" => "Bộ nhớ mặc định",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index e83892144f..8f35fd938a 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,13 +1,24 @@
 <?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" => "邮件已发送",
+"You need to set your user email before being able to send test emails." => "在发送测试邮件钱您需要设置您的用户电子邮件",
+"Send mode" => "发送模式",
 "Encryption" => "加密",
+"Authentication method" => "认证方法",
 "Unable to load list from App Store" => "无法从应用商店载入列表",
-"Authentication error" => "认证出错",
+"Authentication error" => "认证错误",
 "Your full name has been changed." => "您的全名已修改。",
 "Unable to change full name" => "无法修改全名",
 "Group already exists" => "已存在该组",
 "Unable to add group" => "无法添加组",
+"Files decrypted successfully" => "文件解密成功",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "无法解密您的文件，请检查您的 owncloud.log 或询问管理员",
+"Couldn't decrypt your files, check your password and try again" => "无法解密您的文件，请检查密码并重试。",
 "Email saved" => "电子邮件已保存",
 "Invalid email" => "无效的电子邮件",
 "Unable to delete group" => "无法删除组",
@@ -20,8 +31,13 @@ $TRANSLATIONS = array(
 "Couldn't update app." => "无法更新 app。",
 "Wrong password" => "错误密码",
 "No user supplied" => "没有满足的用户",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "请提供管理员恢复密码，否则所有用户的数据都将遗失。",
+"Wrong admin recovery password. Please check the password and try again." => "错误的管理员恢复密码。请检查密码并重试。",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "后端不支持修改密码，但是用户的加密密码已成功更新。",
 "Unable to change password" => "不能更改密码",
+"Sending..." => "正在发送...",
 "User Documentation" => "用户文档",
+"Admin Documentation" => "管理员文档",
 "Update to {appversion}" => "更新至 {appversion}",
 "Disable" => "禁用",
 "Enable" => "开启",
@@ -33,6 +49,12 @@ $TRANSLATIONS = array(
 "Error" => "错误",
 "Update" => "更新",
 "Updated" => "已更新",
+"Select a profile picture" => "选择头像",
+"Very weak password" => "非常弱的密码",
+"Weak password" => "弱密码",
+"So-so password" => "一般强度的密码",
+"Good password" => "较强的密码",
+"Strong password" => "强密码",
 "Decrypting files... Please wait, this can take some time." => "正在解密文件... 请稍等，可能需要一些时间。",
 "deleted" => "已经删除",
 "undo" => "撤销",
@@ -53,7 +75,12 @@ $TRANSLATIONS = array(
 "Fatal issues only" => "仅灾难性问题",
 "None" => "无",
 "Login" => "登录",
+"Plain" => "Plain",
+"NT LAN Manager" => "NT LAN 管理器",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "安全警告",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "您正通过 HTTP 访问 %s。我们强烈建议您配置你的服务器来要求使用 HTTPS。",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。",
 "Setup Warning" => "设置警告",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
@@ -61,31 +88,51 @@ $TRANSLATIONS = array(
 "Module 'fileinfo' missing" => "模块'文件信息'丢失",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
 "Your PHP version is outdated" => "您的 PHP 版本不是最新版",
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "您的 PHP 版本已过期。强烈建议更新至 5.3.8 或者更新版本因为老版本存在已知问题。本次安装可能并未正常工作。",
 "Locale not working" => "本地化无法工作",
+"System locale can not be set to a one which supports UTF-8." => "系统语系无法设置为支持 UTF-8 的语系。",
+"This means that there might be problems with certain characters in file names." => "这意味着一些文件名中的特定字符可能有问题。",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "强烈建议在您的系统上安装需要的软件包来支持以下语系之一：%s。",
 "Internet connection not working" => "因特网连接无法工作",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.",
 "Cron" => "计划任务",
+"Last cron was executed at %s." => "上次定时任务执行于 %s。",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "上次定时任务执行于 %s。这是在一个小时之前执行的，可能出了什么问题。",
+"Cron was not executed yet!" => "定时任务还未被执行！",
 "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 服务来通过 http 每 15 分钟执行 cron.php。",
 "Use systems cron service to call the cron.php file every 15 minutes." => "使用系统 cron 服务每15分钟调用一次 cron.php 文件。",
 "Sharing" => "共享",
 "Enable Share API" => "启用共享API",
 "Allow apps to use the Share API" => "允许应用软件使用共享API",
 "Allow links" => "允许链接",
-"Allow users to share items to the public with links" => "允许用户使用连接公开共享项目",
 "Allow public uploads" => "允许公开上传",
-"Allow users to enable others to upload into their publicly shared folders" => "用户可让其他人上传到他的公开共享文件夹",
+"Set default expiration date" => "设置默认过期日期",
+"Expire after " => "过期于",
+"days" => "天",
+"Enforce expiration date" => "强制过期日期",
+"Allow users to share items to the public with links" => "允许用户使用连接公开共享项目",
 "Allow resharing" => "允许再次共享",
 "Allow users to share items shared with them again" => "允许用户将共享给他们的项目再次共享",
 "Allow users to share with anyone" => "允许用户向任何人共享",
 "Allow users to only share with users in their groups" => "允许用户只向同组用户共享",
 "Allow mail notification" => "允许邮件通知",
+"Allow users to send mail notification for shared files" => "允许用户发送共享文件的邮件通知",
 "Security" => "安全",
 "Enforce HTTPS" => "强制使用 HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "强制客户端通过加密连接连接到%s。",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL.",
+"Email Server" => "电子邮件服务器",
+"This is used for sending out notifications." => "这被用于发送通知。",
+"From address" => "来自地址",
+"Authentication required" => "需要认证",
 "Server address" => "服务器地址",
 "Port" => "端口",
 "Credentials" => "凭证",
+"SMTP Username" => "SMTP 用户名",
+"SMTP Password" => "SMTP 密码",
+"Test email settings" => "测试电子邮件设置",
+"Send email" => "发送邮件",
 "Log" => "日志",
 "Log level" => "日志级别",
 "More" => "更多",
@@ -95,7 +142,9 @@ $TRANSLATIONS = array(
 "Add your App" => "添加应用",
 "More Apps" => "更多应用",
 "Select an App" => "选择一个应用",
+"Documentation:" => "文档：",
 "See application page at apps.owncloud.com" => "查看在 app.owncloud.com 的应用程序页面",
+"See application website" => "参见应用程序网站",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准： <span class=\"author\"></span>",
 "Administrator Documentation" => "管理员文档",
 "Online Documentation" => "在线文档",
@@ -114,16 +163,18 @@ $TRANSLATIONS = array(
 "Full Name" => "全名",
 "Email" => "电子邮件",
 "Your email address" => "您的电子邮件",
+"Fill in an email address to enable password recovery and receive notifications" => "填入电子邮件地址从而启用密码恢复和接收通知",
 "Profile picture" => "联系人图片",
 "Upload new" => "上传新的",
 "Select new from Files" => "从文件中选择一个新的",
 "Remove image" => "移除图片",
+"Either png or jpg. Ideally square but you will be able to crop it." => "png 或 jpg。正方形比较理想但你也可以之后对其进行裁剪。",
 "Your avatar is provided by your original account." => "您的头像由您的原始账户所提供。",
 "Cancel" => "取消",
+"Choose as profile image" => "用作头像",
 "Language" => "语言",
 "Help translate" => "帮助翻译",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "使用这个地址 <a href=\"%s\" target=\"_blank\">通过 WebDAV 访问您的文件</a>",
+"The encryption app is no longer enabled, please decrypt all your files" => "加密 app 不再被启用，请解密您所有的文件",
 "Log-in password" => "登录密码",
 "Decrypt all Files" => "解密所有文件",
 "Login Name" => "登录名称",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 567d6fb594..c60ca4223e 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -106,9 +106,8 @@ $TRANSLATIONS = array(
 "Enable Share API" => "啟用分享 API",
 "Allow apps to use the Share API" => "允許 apps 使用分享 API",
 "Allow links" => "允許連結",
-"Allow users to share items to the public with links" => "允許使用者以結連公開分享檔案",
 "Allow public uploads" => "允許任何人上傳",
-"Allow users to enable others to upload into their publicly shared folders" => "允許使用者將他們公開分享的資料夾設定為「任何人皆可上傳」",
+"Allow users to share items to the public with links" => "允許使用者以結連公開分享檔案",
 "Allow resharing" => "允許轉貼分享",
 "Allow users to share items shared with them again" => "允許使用者分享其他使用者分享給他的檔案",
 "Allow users to share with anyone" => "允許使用者與任何人分享檔案",
@@ -171,8 +170,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "設定為大頭貼",
 "Language" => "語言",
 "Help translate" => "幫助翻譯",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "使用這個地址<a href=\"%s\" target=\"_blank\">來透過 WebDAV 存取檔案</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "加密的軟體不能長時間啟用，請解密所有您的檔案",
 "Log-in password" => "登入密碼",
 "Decrypt all Files" => "解密所有檔案",
diff --git a/settings/personal.php b/settings/personal.php
index be1aa6400b..47b2dc1a46 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -15,7 +15,7 @@ OC_Util::addStyle( 'settings', 'settings' );
 OC_Util::addScript( '3rdparty', 'strengthify/jquery.strengthify' );
 OC_Util::addStyle( '3rdparty', 'strengthify/strengthify' );
 OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
-OC_Util::addStyle( '3rdparty', 'chosen' );
+OC_Util::addStyle( '3rdparty', 'chosen/chosen' );
 \OC_Util::addScript('files', 'jquery.fileupload');
 if (\OC_Config::getValue('enable_avatars', true) === true) {
 	\OC_Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop.min');
@@ -33,7 +33,9 @@ $userLang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N:
 $languageCodes=OC_L10N::findAvailableLanguages();
 
 //check if encryption was enabled in the past
-$enableDecryptAll = OC_Util::encryptedFiles();
+$filesStillEncrypted = OC_Util::encryptedFiles();
+$backupKeysExists = OC_Util::backupKeysExists();
+$enableDecryptAll = $filesStillEncrypted || $backupKeysExists;
 
 // array of common languages
 $commonlangcodes = array(
@@ -92,6 +94,8 @@ $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User:
 $tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
 $tmpl->assign('displayName', OC_User::getDisplayName());
 $tmpl->assign('enableDecryptAll' , $enableDecryptAll);
+$tmpl->assign('backupKeysExists' , $backupKeysExists);
+$tmpl->assign('filesStillEncrypted' , $filesStillEncrypted);
 $tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
 $tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser()));
 
diff --git a/settings/routes.php b/settings/routes.php
index a8bb0d981e..21d406beec 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -54,6 +54,10 @@ $this->create('settings_ajax_setlanguage', '/settings/ajax/setlanguage.php')
 	->actionInclude('settings/ajax/setlanguage.php');
 $this->create('settings_ajax_decryptall', '/settings/ajax/decryptall.php')
 	->actionInclude('settings/ajax/decryptall.php');
+$this->create('settings_ajax_restorekeys', '/settings/ajax/restorekeys.php')
+	->actionInclude('settings/ajax/restorekeys.php');
+$this->create('settings_ajax_deletekeys', '/settings/ajax/deletekeys.php')
+	->actionInclude('settings/ajax/deletekeys.php');
 // apps
 $this->create('settings_ajax_apps_ocs', '/settings/ajax/apps/ocs.php')
 	->actionInclude('settings/ajax/apps/ocs.php');
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index d8a800ca20..d1f519a072 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -217,15 +217,32 @@ if (!$_['internetconnectionworking']) {
 				<input type="checkbox" name="shareapi_allow_links" id="allowLinks"
 					   value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> />
 				<label for="allowLinks"><?php p($l->t('Allow links'));?></label><br/>
-				<em><?php p($l->t('Allow users to share items to the public with links')); ?></em>
-			</td>
-		</tr>
-		<tr>
-			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('class="hidden"');?>>
+				<div <?php ($_['allowLinks'] === 'yes') ? print_unescaped('class="indent"') : print_unescaped('class="hidden indent"');?> id="publicLinkSettings">
+				<input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword"
+						   value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> />
+				<label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
 				<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload"
 				       value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
 				<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
-				<em><?php p($l->t('Allow users to enable others to upload into their publicly shared folders')); ?></em>
+
+				<input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate"
+				       value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> />
+				<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/>
+				<div id="setDefaultExpireDate" <?php ($_['shareDefaultExpireDateSet'] === 'no') ? print_unescaped('class="hidden indent"') : print_unescaped('class="indent"');?>>
+					<?php p($l->t( 'Expire after ' )); ?>
+					<input type="text" name='shareapi_expire_after_n_days' id="shareapiExpireAfterNDays" placeholder="<?php p('7')?>"
+						   value='<?php p($_['shareExpireAfterNDays']) ?>' />
+					<?php p($l->t( 'days' )); ?>
+					<input type="checkbox" name="shareapi_enforce_expire_date" id="shareapiEnforceExpireDate"
+						   value="1" <?php if ($_['shareEnforceExpireDate'] == 'yes') print_unescaped('checked="checked"'); ?> />
+					<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
+				</div>
+
+				</div>
+				<em><?php p($l->t('Allow users to share items to the public with links')); ?></em>
+
+
+
 			</td>
 		</tr>
 		<tr>
@@ -255,22 +272,6 @@ if (!$_['internetconnectionworking']) {
 			</td>
 		</tr>
 
-		<tr>
-			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('class="hidden"');?>>
-				<input type="checkbox" name="shareapi_default_expire_date" id="shareapi_default_expire_date"
-				       value="1" <?php if ($_['shareDefaultExpireDateSet'] == 'yes') print_unescaped('checked="checked"'); ?> />
-				<label for="shareapi_default_expire_date"><?php p($l->t('Set default expiration date'));?></label><br/>
-				<?php p($l->t( 'Expire after ' )); ?>
-				<input type="text" name='shareapi_expire_after_n_days' id="shareapi_expire_after_n_days" placeholder="<?php p('7')?>"
-					   value='<?php p($_['shareExpireAfterNDays']) ?>' />
-				<?php p($l->t( 'days' )); ?>
-				<input type="checkbox" name="shareapi_enforce_expire_date" id="shareapi_enforce_expire_date"
-				       value="1" <?php if ($_['shareEnforceExpireDate'] == 'yes') print_unescaped('checked="checked"'); ?> />
-				<label for="shareapi_enforce_expire_date"><?php p($l->t('Enforce expiration date'));?></label><br/>
-				<em><?php p($l->t('Expire shares by default after N days')); ?></em>
-			</td>
-		</tr>
-
 	</table>
 </div>
 
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index cc1fce88c9..1d1500743a 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -133,21 +133,20 @@ if($_['passwordChangeSupported']) {
 	<?php endif; ?>
 </form>
 
-<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>
-</div>
-
 <?php foreach($_['forms'] as $form) {
 	print_unescaped($form);
 };?>
 
 <?php if($_['enableDecryptAll']): ?>
-<div class="section" id="decryptAll">
+<div class="section">
+
 	<h2>
 		<?php p( $l->t( 'Encryption' ) ); ?>
 	</h2>
+
+	<?php if($_['filesStillEncrypted']): ?>
+
+	<div id="decryptAll">
 	<?php p($l->t( "The encryption app is no longer enabled, please decrypt all your files" )); ?>
 	<p>
 		<input
@@ -164,8 +163,34 @@ if($_['passwordChangeSupported']) {
 		<span class="msg"></span>
 	</p>
 	<br />
+	</div>
+
+	<?php endif; ?>
+
+
+
+	<div id="restoreBackupKeys" <?php $_['backupKeysExists'] ? '' : print_unescaped("class='hidden'") ?>>
+
+	<?php p($l->t( "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." )); ?>
+	<p>
+		<button
+			type="button"
+			name="submitRestoreKeys"><?php p($l->t( "Restore Encryption Keys" )); ?>
+		</button>
+		<button
+			type="button"
+			name="submitDeleteKeys"><?php p($l->t( "Delete Encryption Keys" )); ?>
+		</button>
+		<span class="msg"></span>
+
+	</p>
+	<br />
+
+	</div>
+
+
 </div>
-<?php endif; ?>
+	<?php endif; ?>
 
 <div class="section">
 	<h2><?php p($l->t('Version'));?></h2>
diff --git a/status.php b/status.php
index 4e423560aa..a42c1581b8 100644
--- a/status.php
+++ b/status.php
@@ -34,7 +34,7 @@ try {
 	if (OC::$CLI) {
 		print_r($values);
 	} else {
-		print_unescaped(json_encode($values));
+		echo json_encode($values);
 	}
 
 } catch (Exception $ex) {
diff --git a/tests/enable_all.php b/tests/enable_all.php
index efb43cae50..386ae2070e 100644
--- a/tests/enable_all.php
+++ b/tests/enable_all.php
@@ -18,7 +18,7 @@ function enableApp($app) {
 
 enableApp('files_sharing');
 enableApp('files_encryption');
-//enableApp('files_external');
+enableApp('files_external');
 enableApp('user_ldap');
 enableApp('files_versions');
 
diff --git a/tests/karma.config.js b/tests/karma.config.js
index 338e3f868e..08b49d854e 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -43,7 +43,7 @@ module.exports = function(config) {
 		return apps;
 		*/
 		// other apps tests don't run yet... needs further research / clean up
-		return ['files'];
+		return ['files', 'files_trashbin'];
 	}
 
 	// respect NOCOVERAGE env variable
diff --git a/tests/lib/app.php b/tests/lib/app.php
index 49f40f089b..683820cabb 100644
--- a/tests/lib/app.php
+++ b/tests/lib/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2012 Bernhard Posselt <nukeawhale@gmail.com>
+ * Copyright (c) 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php
index 3628e4ceab..92fa483834 100644
--- a/tests/lib/appframework/AppTest.php
+++ b/tests/lib/appframework/AppTest.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/tests/lib/appframework/controller/ApiControllerTest.php b/tests/lib/appframework/controller/ApiControllerTest.php
new file mode 100644
index 0000000000..b772f540ce
--- /dev/null
+++ b/tests/lib/appframework/controller/ApiControllerTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCP\AppFramework;
+
+use OC\AppFramework\Http\Request;
+use OCP\AppFramework\Http\TemplateResponse;
+
+
+class ChildApiController extends ApiController {};
+
+
+class ApiControllerTest extends \PHPUnit_Framework_TestCase {
+
+
+    public function testCors() {
+        $request = new Request(
+            array('server' => array('HTTP_ORIGIN' => 'test'))
+        );
+        $this->controller = new ChildApiController('app', $request, 'verbs',
+            'headers', 100);
+
+        $response = $this->controller->preflightedCors();
+
+        $headers = $response->getHeaders();
+
+        $this->assertEquals('test', $headers['Access-Control-Allow-Origin']);
+        $this->assertEquals('verbs', $headers['Access-Control-Allow-Methods']);
+        $this->assertEquals('headers', $headers['Access-Control-Allow-Headers']);
+        $this->assertEquals('false', $headers['Access-Control-Allow-Credentials']);
+        $this->assertEquals(100, $headers['Access-Control-Max-Age']);
+    }
+
+}
diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php
index f17d5f24aa..3c1716a91d 100644
--- a/tests/lib/appframework/controller/ControllerTest.php
+++ b/tests/lib/appframework/controller/ControllerTest.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -22,14 +22,35 @@
  */
 
 
-namespace Test\AppFramework\Controller;
+namespace OCP\AppFramework;
 
 use OC\AppFramework\Http\Request;
-use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Http\IResponseSerializer;
 
 
-class ChildController extends Controller {};
+class ToUpperCaseSerializer implements IResponseSerializer {
+	public function serialize($response) {
+		return array(strtoupper($response));
+	}
+}
+
+class ChildController extends Controller {
+	public function custom($in) {
+		$this->registerResponder('json', function ($response) {
+			return new JSONResponse(array(strlen($response)));
+		});
+
+		return $in;
+	}
+
+	public function serializer($in) {
+		$this->registerSerializer(new ToUpperCaseSerializer());
+
+		return $in;
+	}
+};
 
 class ControllerTest extends \PHPUnit_Framework_TestCase {
 
@@ -129,4 +150,36 @@ class ControllerTest extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals('daheim', $this->controller->env('PATH'));
 	}
 
+
+	/**
+	 * @expectedException \DomainException
+	 */
+	public function testFormatResonseInvalidFormat() {
+		$this->controller->buildResponse(null, 'test');
+	}
+
+
+	public function testFormat() {
+		$response = $this->controller->buildResponse(array('hi'), 'json');
+
+		$this->assertEquals(array('hi'), $response->getData());
+	}
+
+
+	public function testCustomFormatter() {
+		$response = $this->controller->custom('hi');
+		$response = $this->controller->buildResponse($response, 'json');
+
+		$this->assertEquals(array(2), $response->getData());		
+	}
+
+
+	public function testCustomSerializer() {
+		$response = $this->controller->serializer('hi');
+		$response = $this->controller->buildResponse($response, 'json');
+
+		$this->assertEquals(array('HI'), $response->getData());	
+	}
+
+
 }
diff --git a/tests/lib/appframework/db/EntityTest.php b/tests/lib/appframework/db/EntityTest.php
new file mode 100644
index 0000000000..9de44b9b3b
--- /dev/null
+++ b/tests/lib/appframework/db/EntityTest.php
@@ -0,0 +1,223 @@
+<?php
+
+/**
+* ownCloud - App Framework
+*
+* @author Bernhard Posselt
+* @copyright 2012 Bernhard Posselt dev@bernhard-posselt.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 OCP\AppFramework\Db;
+
+
+/**
+ * @method integer getId()
+ * @method void setId(integer $id)
+ * @method integer getTestId()
+ * @method void setTestId(integer $id)
+ * @method string getName()
+ * @method void setName(string $name)
+ * @method string getEmail()
+ * @method void setEmail(string $email)
+ * @method string getPreName()
+ * @method void setPreName(string $preName)
+ */
+class TestEntity extends Entity {
+	public $name;
+	public $email;
+	public $testId;
+	public $preName;
+
+	public function __construct($name=null){
+		$this->addType('testId', 'integer');		
+		$this->name = $name;
+	}
+};
+
+
+class EntityTest extends \PHPUnit_Framework_TestCase {
+
+	private $entity;
+
+	protected function setUp(){
+		$this->entity = new TestEntity();
+	}
+
+
+	public function testResetUpdatedFields(){
+		$entity = new TestEntity();
+		$entity->setId(3);
+		$entity->resetUpdatedFields();
+
+		$this->assertEquals(array(), $entity->getUpdatedFields());
+	}
+
+
+	public function testFromRow(){
+		$row = array(
+			'pre_name' => 'john', 
+			'email' => 'john@something.com'
+		);
+		$this->entity = TestEntity::fromRow($row);
+
+		$this->assertEquals($row['pre_name'], $this->entity->getPreName());
+		$this->assertEquals($row['email'], $this->entity->getEmail());
+	}
+
+
+	public function testGetSetId(){
+		$id = 3;
+		$this->entity->setId(3);
+
+		$this->assertEquals($id, $this->entity->getId());
+	}
+
+
+	public function testColumnToPropertyNoReplacement(){
+		$column = 'my';
+		$this->assertEquals('my', 
+			$this->entity->columnToProperty($column));
+	}
+
+
+	public function testColumnToProperty(){
+		$column = 'my_attribute';
+		$this->assertEquals('myAttribute', 
+			$this->entity->columnToProperty($column));
+	}
+
+
+	public function testPropertyToColumnNoReplacement(){
+		$property = 'my';
+		$this->assertEquals('my', 
+			$this->entity->propertyToColumn($property));
+	}
+
+
+	public function testSetterMarksFieldUpdated(){
+		$this->entity->setId(3);
+
+		$this->assertContains('id', $this->entity->getUpdatedFields());
+	}
+
+
+	public function testCallShouldOnlyWorkForGetterSetter(){
+		$this->setExpectedException('\BadFunctionCallException');
+
+		$this->entity->something();
+	}
+
+
+	public function testGetterShouldFailIfAttributeNotDefined(){
+		$this->setExpectedException('\BadFunctionCallException');
+
+		$this->entity->getTest();
+	}
+
+
+	public function testSetterShouldFailIfAttributeNotDefined(){
+		$this->setExpectedException('\BadFunctionCallException');
+
+		$this->entity->setTest();
+	}
+
+
+	public function testFromRowShouldNotAssignEmptyArray(){
+		$row = array();
+		$entity2 = new TestEntity();
+
+		$this->entity = TestEntity::fromRow($row);
+		$this->assertEquals($entity2, $this->entity);
+	}
+
+
+	public function testIdGetsConvertedToInt(){
+		$row = array('id' => '4');
+
+		$this->entity = TestEntity::fromRow($row);
+		$this->assertSame(4, $this->entity->getId());
+	}
+
+
+	public function testSetType(){
+		$row = array('testId' => '4');
+
+		$this->entity = TestEntity::fromRow($row);
+		$this->assertSame(4, $this->entity->getTestId());
+	}
+
+
+	public function testFromParams(){
+		$params = array(
+			'testId' => 4,
+			'email' => 'john@doe'
+		);
+
+		$entity = TestEntity::fromParams($params);
+
+		$this->assertEquals($params['testId'], $entity->getTestId());
+		$this->assertEquals($params['email'], $entity->getEmail());
+		$this->assertTrue($entity instanceof TestEntity);
+	}
+
+	public function testSlugify(){
+		$entity = new TestEntity();
+		$entity->setName('Slugify this!');
+		$this->assertEquals('slugify-this', $entity->slugify('name'));
+		$entity->setName('°!"§$%&/()=?`´ß\}][{³²#\'+~*-_.:,;<>|äöüÄÖÜSlugify this!');
+		$this->assertEquals('slugify-this', $entity->slugify('name'));
+	}
+
+
+	public function testSetterCasts() {
+		$entity = new TestEntity();
+		$entity->setId('3');
+		$this->assertSame(3, $entity->getId());
+	}
+
+
+	public function testSetterDoesNotCastOnNull() {
+		$entity = new TestEntity();
+		$entity->setId(null);
+		$this->assertSame(null, $entity->getId());
+	}
+
+
+	public function testGetFieldTypes() {
+		$entity = new TestEntity();
+		$this->assertEquals(array(
+			'id' => 'integer',
+			'testId' => 'integer'
+		), $entity->getFieldTypes());
+	}
+
+
+	public function testGetItInt() {
+		$entity = new TestEntity();
+		$entity->setId(3);
+		$this->assertEquals('integer', gettype($entity->getId()));
+	}
+
+
+	public function testFieldsNotMarkedUpdatedIfNothingChanges() {
+		$entity = new TestEntity('hey');
+		$entity->setName('hey');
+		$this->assertEquals(0, count($entity->getUpdatedFields()));
+	}
+
+
+}
\ No newline at end of file
diff --git a/tests/lib/appframework/db/MapperTest.php b/tests/lib/appframework/db/MapperTest.php
new file mode 100644
index 0000000000..4ddc4ef042
--- /dev/null
+++ b/tests/lib/appframework/db/MapperTest.php
@@ -0,0 +1,279 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.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 OCP\AppFramework\Db;
+
+use \OCP\IDb;
+
+
+require_once __DIR__ . '/MapperTestUtility.php';
+
+/**
+ * @method integer getId()
+ * @method void setId(integer $id)
+ * @method string getEmail()
+ * @method void setEmail(string $email)
+ * @method string getPreName()
+ * @method void setPreName(string $preName)
+ */
+class Example extends Entity {
+	public $preName;
+	public $email;
+};
+
+
+class ExampleMapper extends Mapper {
+	public function __construct(IDb $db){ parent::__construct($db, 'table'); }
+	public function find($table, $id){ return $this->findOneQuery($table, $id); }
+	public function findOneEntity($table, $id){ return $this->findEntity($table, $id); }
+	public function findAllEntities($table){ return $this->findEntities($table); }
+	public function mapRow($row){ return $this->mapRowToEntity($row); }
+}
+
+
+class MapperTest extends MapperTestUtility {
+
+	private $mapper;
+
+	public function setUp(){
+		parent::setUp();
+		$this->mapper = new ExampleMapper($this->db);
+	}
+
+
+	public function testMapperShouldSetTableName(){
+		$this->assertEquals('*PREFIX*table', $this->mapper->getTableName());
+	}
+
+
+	public function testFindQuery(){
+		$sql = 'hi';
+		$params = array('jo');
+		$rows = array(
+			array('hi')
+		);
+		$this->setMapperResult($sql, $params, $rows);		
+		$this->mapper->find($sql, $params);
+	}
+
+	public function testFindEntity(){
+		$sql = 'hi';
+		$params = array('jo');
+		$rows = array(
+			array('pre_name' => 'hi')
+		);
+		$this->setMapperResult($sql, $params, $rows);
+		$this->mapper->findOneEntity($sql, $params);
+	}
+
+	public function testFindNotFound(){
+		$sql = 'hi';
+		$params = array('jo');
+		$rows = array();
+		$this->setMapperResult($sql, $params, $rows);		
+		$this->setExpectedException(
+			'\OCP\AppFramework\Db\DoesNotExistException');
+		$this->mapper->find($sql, $params);
+	}
+
+	public function testFindEntityNotFound(){
+		$sql = 'hi';
+		$params = array('jo');
+		$rows = array();
+		$this->setMapperResult($sql, $params, $rows);
+		$this->setExpectedException(
+			'\OCP\AppFramework\Db\DoesNotExistException');
+		$this->mapper->findOneEntity($sql, $params);
+	}
+
+	public function testFindMultiple(){
+		$sql = 'hi';
+		$params = array('jo');
+		$rows = array(
+			array('jo'), array('ho')
+		);
+		$this->setMapperResult($sql, $params, $rows);
+		$this->setExpectedException(
+			'\OCP\AppFramework\Db\MultipleObjectsReturnedException');
+		$this->mapper->find($sql, $params);
+	}
+
+	public function testFindEntityMultiple(){
+		$sql = 'hi';
+		$params = array('jo');
+		$rows = array(
+			array('jo'), array('ho')
+		);
+		$this->setMapperResult($sql, $params, $rows);
+		$this->setExpectedException(
+			'\OCP\AppFramework\Db\MultipleObjectsReturnedException');
+		$this->mapper->findOneEntity($sql, $params);
+	}
+
+
+	public function testDelete(){
+		$sql = 'DELETE FROM `*PREFIX*table` WHERE `id` = ?';
+		$params = array(2);
+
+		$this->setMapperResult($sql, $params);
+		$entity = new Example();
+		$entity->setId($params[0]);
+
+		$this->mapper->delete($entity);
+	}
+
+
+	public function testCreate(){
+		$this->db->expects($this->once())
+			->method('getInsertId')
+			->with($this->equalTo('*PREFIX*table'))
+			->will($this->returnValue(3));
+		$this->mapper = new ExampleMapper($this->db);
+
+		$sql = 'INSERT INTO `*PREFIX*table`(`pre_name`,`email`) ' .
+				'VALUES(?,?)';
+		$params = array('john', 'my@email');
+		$entity = new Example();
+		$entity->setPreName($params[0]);
+		$entity->setEmail($params[1]);
+
+		$this->setMapperResult($sql, $params);
+
+		$this->mapper->insert($entity);
+	}
+
+
+	public function testCreateShouldReturnItemWithCorrectInsertId(){
+		$this->db->expects($this->once())
+			->method('getInsertId')
+			->with($this->equalTo('*PREFIX*table'))
+			->will($this->returnValue(3));
+		$this->mapper = new ExampleMapper($this->db);
+
+		$sql = 'INSERT INTO `*PREFIX*table`(`pre_name`,`email`) ' .
+				'VALUES(?,?)';
+		$params = array('john', 'my@email');
+		$entity = new Example();
+		$entity->setPreName($params[0]);
+		$entity->setEmail($params[1]);
+
+		$this->setMapperResult($sql, $params);
+
+		$result = $this->mapper->insert($entity);
+
+		$this->assertEquals(3, $result->getId());
+	}
+
+
+	public function testUpdate(){
+		$sql = 'UPDATE `*PREFIX*table` ' .
+				'SET ' .
+				'`pre_name` = ?,'.
+				'`email` = ? ' .
+				'WHERE `id` = ?';
+
+		$params = array('john', 'my@email', 1);
+		$entity = new Example();
+		$entity->setPreName($params[0]);
+		$entity->setEmail($params[1]);
+		$entity->setId($params[2]);
+
+		$this->setMapperResult($sql, $params);
+
+		$this->mapper->update($entity);
+	}
+
+
+	public function testUpdateNoId(){
+		$params = array('john', 'my@email');
+		$entity = new Example();
+		$entity->setPreName($params[0]);
+		$entity->setEmail($params[1]);
+
+		$this->setExpectedException('InvalidArgumentException');
+
+		$this->mapper->update($entity);
+	}
+
+
+	public function testUpdateNothingChangedNoQuery(){
+		$params = array('john', 'my@email');
+		$entity = new Example();
+		$entity->setId(3);
+		$entity->setEmail($params[1]);
+		$entity->resetUpdatedFields();
+
+		$this->db->expects($this->never())
+			->method('prepareQuery');
+
+		$this->mapper->update($entity);
+	}
+
+
+	public function testMapRowToEntity(){
+		$entity1 = $this->mapper->mapRow(array('pre_name' => 'test1', 'email' => 'test2'));
+		$entity2 = new Example();
+		$entity2->setPreName('test1');
+		$entity2->setEmail('test2');
+		$entity2->resetUpdatedFields();
+		$this->assertEquals($entity2, $entity1);
+	}
+
+	public function testFindEntities(){
+		$sql = 'hi';
+		$rows = array(
+			array('pre_name' => 'hi')
+		);
+		$entity = new Example();
+		$entity->setPreName('hi');
+		$entity->resetUpdatedFields();
+		$this->setMapperResult($sql, array(), $rows);
+		$result = $this->mapper->findAllEntities($sql);
+		$this->assertEquals(array($entity), $result);
+	}
+
+	public function testFindEntitiesNotFound(){
+		$sql = 'hi';
+		$rows = array();
+		$this->setMapperResult($sql, array(), $rows);
+		$result = $this->mapper->findAllEntities($sql);
+		$this->assertEquals(array(), $result);
+	}
+
+	public function testFindEntitiesMultiple(){
+		$sql = 'hi';
+		$rows = array(
+			array('pre_name' => 'jo'), array('email' => 'ho')
+		);
+		$entity1 = new Example();
+		$entity1->setPreName('jo');
+		$entity1->resetUpdatedFields();
+		$entity2 = new Example();
+		$entity2->setEmail('ho');
+		$entity2->resetUpdatedFields();
+		$this->setMapperResult($sql, array(), $rows);
+		$result = $this->mapper->findAllEntities($sql);
+		$this->assertEquals(array($entity1, $entity2), $result);
+	}
+}
\ No newline at end of file
diff --git a/tests/lib/appframework/db/MapperTestUtility.php b/tests/lib/appframework/db/MapperTestUtility.php
new file mode 100644
index 0000000000..fc0e5c2c44
--- /dev/null
+++ b/tests/lib/appframework/db/MapperTestUtility.php
@@ -0,0 +1,179 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.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 OCP\AppFramework\Db;
+
+
+/**
+ * Simple utility class for testing mappers
+ */
+abstract class MapperTestUtility extends \PHPUnit_Framework_TestCase {
+
+
+	protected $db;
+	private $query;
+	private $pdoResult;
+	private $queryAt;
+	private $prepareAt;
+	private $fetchAt;
+	private $iterators;
+	
+
+	/**
+	 * Run this function before the actual test to either set or initialize the
+	 * db. After this the db can be accessed by using $this->db
+	 */
+	protected function setUp(){
+		$this->db = $this->getMockBuilder(
+			'\OCP\IDb')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->query = $this->getMock('Query', array('execute', 'bindValue'));
+		$this->pdoResult = $this->getMock('Result', array('fetch'));
+		$this->queryAt = 0;
+		$this->prepareAt = 0;
+		$this->iterators = array();
+		$this->fetchAt = 0;
+	}
+
+
+	/**
+	 * Create mocks and set expected results for database queries
+	 * @param string $sql the sql query that you expect to receive
+	 * @param array $arguments the expected arguments for the prepare query
+	 * method
+	 * @param array $returnRows the rows that should be returned for the result
+	 * of the database query. If not provided, it wont be assumed that fetch
+	 * will be called on the result
+	 */
+	protected function setMapperResult($sql, $arguments=array(), $returnRows=array(),
+		$limit=null, $offset=null){
+
+		$this->iterators[] = new ArgumentIterator($returnRows);
+
+		$iterators = $this->iterators;
+		$fetchAt = $this->fetchAt;
+
+		$this->pdoResult->expects($this->any())
+			->method('fetch')
+			->will($this->returnCallback(
+				function() use ($iterators, $fetchAt){
+					$iterator = $iterators[$fetchAt];
+					$result = $iterator->next();
+
+					if($result === false) {
+						$fetchAt++;
+					}
+
+					return $result;
+			  	}
+			));
+
+		$index = 1;
+		foreach($arguments as $argument) {
+			switch (gettype($argument)) {
+				case 'integer':
+					$pdoConstant = \PDO::PARAM_INT;
+					break;
+
+				case 'NULL':
+					$pdoConstant = \PDO::PARAM_NULL;
+					break;
+
+				case 'boolean':
+					$pdoConstant = \PDO::PARAM_BOOL;
+					break;
+				
+				default:
+					$pdoConstant = \PDO::PARAM_STR;
+					break;
+			}
+			$this->query->expects($this->at($this->queryAt))
+				->method('bindValue')
+				->with($this->equalTo($index),
+					$this->equalTo($argument),
+					$this->equalTo($pdoConstant));
+			$index++;
+			$this->queryAt++;
+		}
+
+		$this->query->expects($this->at($this->queryAt))
+			->method('execute')
+			->with()
+			->will($this->returnValue($this->pdoResult));
+		$this->queryAt++;
+
+		if($limit === null && $offset === null) {
+			$this->db->expects($this->at($this->prepareAt))
+				->method('prepareQuery')
+				->with($this->equalTo($sql))
+				->will(($this->returnValue($this->query)));
+		} elseif($limit !== null && $offset === null) {
+			$this->db->expects($this->at($this->prepareAt))
+				->method('prepareQuery')
+				->with($this->equalTo($sql), $this->equalTo($limit))
+				->will(($this->returnValue($this->query)));
+		} elseif($limit === null && $offset !== null) {
+			$this->db->expects($this->at($this->prepareAt))
+				->method('prepareQuery')
+				->with($this->equalTo($sql), 
+					$this->equalTo(null),
+					$this->equalTo($offset))
+				->will(($this->returnValue($this->query)));
+		} else  {
+			$this->db->expects($this->at($this->prepareAt))
+				->method('prepareQuery')
+				->with($this->equalTo($sql), 
+					$this->equalTo($limit),
+					$this->equalTo($offset))
+				->will(($this->returnValue($this->query)));
+		}
+		$this->prepareAt++;
+		$this->fetchAt++;
+
+	}
+
+
+}
+
+
+class ArgumentIterator {
+
+	private $arguments;
+	
+	public function __construct($arguments){
+		$this->arguments = $arguments;
+	}
+	
+	public function next(){
+		$result = array_shift($this->arguments);
+		if($result === null){
+			return false;
+		} else {
+			return $result;
+		}
+	}
+}
+
diff --git a/tests/lib/appframework/dependencyinjection/DIContainerTest.php b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
index d1bc900fb2..acc5c2e66d 100644
--- a/tests/lib/appframework/dependencyinjection/DIContainerTest.php
+++ b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
@@ -5,8 +5,8 @@
  *
  * @author Bernhard Posselt
  * @author Morris Jobke
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
- * @copyright 2013 Morris Jobke morris.jobke@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
+ * @copyright 2013 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
diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php
index 9841dcaa1f..8117eec207 100644
--- a/tests/lib/appframework/http/DispatcherTest.php
+++ b/tests/lib/appframework/http/DispatcherTest.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -25,8 +25,28 @@
 namespace OC\AppFramework\Http;
 
 use OC\AppFramework\Middleware\MiddlewareDispatcher;
+use OC\AppFramework\Utility\ControllerMethodReflector;
 use OCP\AppFramework\Http;
-//require_once(__DIR__ . "/../classloader.php");
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Controller;
+
+
+class TestController extends Controller {
+	public function __construct($appName, $request) {
+		parent::__construct($appName, $request);
+	}
+
+	/**
+	 * @param int $int
+	 * @param bool $bool
+	 */
+	public function exec($int, $bool, $test=4, $test2=1) {
+		$this->registerResponder('text', function($in) {
+			return new JSONResponse(array('text' => $in));
+		});
+		return array($int, $bool, $test, $test2);
+	}
+}
 
 
 class DispatcherTest extends \PHPUnit_Framework_TestCase {
@@ -39,6 +59,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 	private $lastModified;
 	private $etag;
 	private $http;
+	private $reflector;
 
 	protected function setUp() {
 		$this->controllerMethod = 'test';
@@ -64,8 +85,17 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 			'\OCP\AppFramework\Controller',
 			array($this->controllerMethod), array($app, $request));
 		
+		$this->request = $this->getMockBuilder(
+			'\OC\AppFramework\Http\Request')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->reflector = new ControllerMethodReflector();
+
 		$this->dispatcher = new Dispatcher(
-			$this->http, $this->middlewareDispatcher);
+			$this->http, $this->middlewareDispatcher, $this->reflector,
+			$this->request
+		);
 		
 		$this->response = $this->getMockBuilder(
 			'\OCP\AppFramework\Http\Response')
@@ -81,7 +111,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 	 * @param string $out
 	 * @param string $httpHeaders
 	 */
-	private function setMiddlewareExpections($out=null, 
+	private function setMiddlewareExpectations($out=null, 
 		$httpHeaders=null, $responseHeaders=array(),
 		$ex=false, $catchEx=true) {
 
@@ -159,14 +189,12 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 			->with($this->equalTo($this->controller), 
 				$this->equalTo($this->controllerMethod),
 				$this->equalTo($out))
-			->will($this->returnValue($out));
-
-		
+			->will($this->returnValue($out));		
 	}
 
 
 	public function testDispatcherReturnsArrayWith2Entries() {
-		$this->setMiddlewareExpections();
+		$this->setMiddlewareExpectations();
 
 		$response = $this->dispatcher->dispatch($this->controller, 
 			$this->controllerMethod);
@@ -180,7 +208,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 		$out = 'yo';
 		$httpHeaders = 'Http';
 		$responseHeaders = array('hell' => 'yeah');
-		$this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders);
+		$this->setMiddlewareExpectations($out, $httpHeaders, $responseHeaders);
 
 		$response = $this->dispatcher->dispatch($this->controller, 
 			$this->controllerMethod);
@@ -195,7 +223,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 		$out = 'yo';
 		$httpHeaders = 'Http';
 		$responseHeaders = array('hell' => 'yeah');
-		$this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders, true);		
+		$this->setMiddlewareExpectations($out, $httpHeaders, $responseHeaders, true);		
 
 		$response = $this->dispatcher->dispatch($this->controller, 
 			$this->controllerMethod);
@@ -210,7 +238,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 		$out = 'yo';
 		$httpHeaders = 'Http';
 		$responseHeaders = array('hell' => 'yeah');
-		$this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders, true, false);
+		$this->setMiddlewareExpectations($out, $httpHeaders, $responseHeaders, true, false);
 
 		$this->setExpectedException('\Exception');
 		$response = $this->dispatcher->dispatch($this->controller, 
@@ -218,4 +246,148 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 
 	}
 
+
+	private function dispatcherPassthrough() {
+		$this->middlewareDispatcher->expects($this->once())
+				->method('beforeController');
+		$this->middlewareDispatcher->expects($this->once())
+			->method('afterController')
+			->will($this->returnCallback(function($a, $b, $in) {
+				return $in;
+			}));
+		$this->middlewareDispatcher->expects($this->once())
+			->method('beforeOutput')
+			->will($this->returnCallback(function($a, $b, $in) {
+				return $in;
+			}));
+	}
+
+
+	public function testControllerParametersInjected() {
+		$this->request = new Request(array(
+			'post' => array(
+				'int' => '3',
+				'bool' => 'false'
+			),
+			'method' => 'POST'
+		));
+		$this->dispatcher = new Dispatcher(
+			$this->http, $this->middlewareDispatcher, $this->reflector,
+			$this->request
+		);
+		$controller = new TestController('app', $this->request);
+
+		// reflector is supposed to be called once
+		$this->dispatcherPassthrough();
+		$response = $this->dispatcher->dispatch($controller, 'exec');
+
+		$this->assertEquals('[3,true,4,1]', $response[2]);
+	}
+
+
+	public function testControllerParametersInjectedDefaultOverwritten() {
+		$this->request = new Request(array(
+			'post' => array(
+				'int' => '3',
+				'bool' => 'false',
+				'test2' => 7
+			),
+			'method' => 'POST'
+		));
+		$this->dispatcher = new Dispatcher(
+			$this->http, $this->middlewareDispatcher, $this->reflector,
+			$this->request
+		);
+		$controller = new TestController('app', $this->request);
+
+		// reflector is supposed to be called once
+		$this->dispatcherPassthrough();
+		$response = $this->dispatcher->dispatch($controller, 'exec');
+
+		$this->assertEquals('[3,true,4,7]', $response[2]);
+	}
+
+
+
+	public function testResponseTransformedByUrlFormat() {
+		$this->request = new Request(array(
+			'post' => array(
+				'int' => '3',
+				'bool' => 'false'
+			),
+			'urlParams' => array(
+				'format' => 'text'
+			),
+			'method' => 'GET'
+		));
+		$this->dispatcher = new Dispatcher(
+			$this->http, $this->middlewareDispatcher, $this->reflector,
+			$this->request
+		);
+		$controller = new TestController('app', $this->request);
+
+		// reflector is supposed to be called once
+		$this->dispatcherPassthrough();
+		$response = $this->dispatcher->dispatch($controller, 'exec');
+
+		$this->assertEquals('{"text":[3,false,4,1]}', $response[2]);
+	}
+
+
+	public function testResponseTransformedByAcceptHeader() {
+		$this->request = new Request(array(
+			'post' => array(
+				'int' => '3',
+				'bool' => 'false'
+			),
+			'server' => array(
+				'HTTP_ACCEPT' => 'application/text, test',
+				'HTTP_CONTENT_TYPE' => 'application/x-www-form-urlencoded'
+			),
+			'method' => 'PUT'
+		));
+		$this->dispatcher = new Dispatcher(
+			$this->http, $this->middlewareDispatcher, $this->reflector,
+			$this->request
+		);
+		$controller = new TestController('app', $this->request);
+
+		// reflector is supposed to be called once
+		$this->dispatcherPassthrough();
+		$response = $this->dispatcher->dispatch($controller, 'exec');
+
+		$this->assertEquals('{"text":[3,false,4,1]}', $response[2]);
+	}
+
+
+	public function testResponsePrimarilyTransformedByParameterFormat() {
+		$this->request = new Request(array(
+			'post' => array(
+				'int' => '3',
+				'bool' => 'false'
+			),
+			'get' => array(
+				'format' => 'text'
+			),
+			'server' => array(
+				'HTTP_ACCEPT' => 'application/json, test'
+			),
+			'method' => 'POST'
+		));
+		$this->dispatcher = new Dispatcher(
+			$this->http, $this->middlewareDispatcher, $this->reflector,
+			$this->request
+		);
+		$controller = new TestController('app', $this->request);
+
+		// reflector is supposed to be called once
+		$this->dispatcherPassthrough();
+		$response = $this->dispatcher->dispatch($controller, 'exec');
+
+		$this->assertEquals('{"text":[3,true,4,1]}', $response[2]);
+	}
+
+
+
+
 }
diff --git a/tests/lib/appframework/http/DownloadResponseTest.php b/tests/lib/appframework/http/DownloadResponseTest.php
index b305c63ad4..5be16ce3c4 100644
--- a/tests/lib/appframework/http/DownloadResponseTest.php
+++ b/tests/lib/appframework/http/DownloadResponseTest.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/tests/lib/appframework/http/HttpTest.php b/tests/lib/appframework/http/HttpTest.php
index 0bdcee24c9..c62fa43863 100644
--- a/tests/lib/appframework/http/HttpTest.php
+++ b/tests/lib/appframework/http/HttpTest.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php
index fbaae1b922..c0c58ebf76 100644
--- a/tests/lib/appframework/http/JSONResponseTest.php
+++ b/tests/lib/appframework/http/JSONResponseTest.php
@@ -5,8 +5,8 @@
  *
  * @author Bernhard Posselt
  * @author Morris Jobke
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
- * @copyright 2013 Morris Jobke morris.jobke@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
+ * @copyright 2013 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
diff --git a/tests/lib/appframework/http/RedirectResponseTest.php b/tests/lib/appframework/http/RedirectResponseTest.php
index f62b420f4e..dfd0d7ee7d 100644
--- a/tests/lib/appframework/http/RedirectResponseTest.php
+++ b/tests/lib/appframework/http/RedirectResponseTest.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/tests/lib/appframework/http/ResponseTest.php b/tests/lib/appframework/http/ResponseTest.php
index 27350725d7..e83fe9e2d8 100644
--- a/tests/lib/appframework/http/ResponseTest.php
+++ b/tests/lib/appframework/http/ResponseTest.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -42,7 +42,7 @@ class ResponseTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testAddHeader(){
-		$this->childResponse->addHeader('hello', 'world');
+		$this->childResponse->addHeader(' hello ', 'world');
 		$headers = $this->childResponse->getHeaders();
 		$this->assertEquals('world', $headers['hello']);
 	}
diff --git a/tests/lib/appframework/http/TemplateResponseTest.php b/tests/lib/appframework/http/TemplateResponseTest.php
index 0b158edff6..afdcf322b8 100644
--- a/tests/lib/appframework/http/TemplateResponseTest.php
+++ b/tests/lib/appframework/http/TemplateResponseTest.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -51,6 +51,22 @@ class TemplateResponseTest extends \PHPUnit_Framework_TestCase {
 	}
 
 
+	public function testSetParamsConstructor(){
+		$params = array('hi' => 'yo');
+		$this->tpl = new TemplateResponse($this->api, 'home', $params);
+
+		$this->assertEquals(array('hi' => 'yo'), $this->tpl->getParams());
+	}
+
+
+	public function testSetRenderAsConstructor(){
+		$renderAs = 'myrender';
+		$this->tpl = new TemplateResponse($this->api, 'home', array(), $renderAs);
+
+		$this->assertEquals($renderAs, $this->tpl->getRenderAs());
+	}
+
+
 	public function testSetParams(){
 		$params = array('hi' => 'yo');
 		$this->tpl->setParams($params);
@@ -63,36 +79,6 @@ class TemplateResponseTest extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals('home', $this->tpl->getTemplateName());
 	}
 
-
-//	public function testRender(){
-//		$ocTpl = $this->getMock('Template', array('fetchPage'));
-//		$ocTpl->expects($this->once())
-//				->method('fetchPage');
-//
-//		$tpl = new TemplateResponse('core', 'error');
-//
-//		$tpl->render();
-//	}
-//
-//
-//	public function testRenderAssignsParams(){
-//		$params = array('john' => 'doe');
-//
-//		$tpl = new TemplateResponse('app', 'home');
-//		$tpl->setParams($params);
-//
-//		$tpl->render();
-//	}
-//
-//
-//	public function testRenderDifferentApp(){
-//
-//		$tpl = new TemplateResponse('app', 'home', 'app2');
-//
-//		$tpl->render();
-//	}
-
-
 	public function testGetRenderAs(){
 		$render = 'myrender';
 		$this->tpl->renderAs($render);
diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
index 935f97d2a6..b1a58e2128 100644
--- a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/tests/lib/appframework/middleware/MiddlewareTest.php b/tests/lib/appframework/middleware/MiddlewareTest.php
index 7a93c0d4dd..814efdd811 100644
--- a/tests/lib/appframework/middleware/MiddlewareTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareTest.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php b/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php
new file mode 100644
index 0000000000..79cd3b278a
--- /dev/null
+++ b/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * ownCloud - App Framework
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @copyright Bernhard Posselt 2014
+ */
+
+
+namespace OC\AppFramework\Middleware\Security;
+
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Utility\ControllerMethodReflector;
+
+use OCP\AppFramework\Http\Response;
+
+
+class CORSMiddlewareTest extends \PHPUnit_Framework_TestCase {
+
+	private $reflector;
+
+	protected function setUp() {
+		$this->reflector = new ControllerMethodReflector();
+	}
+
+	/**
+	 * @CORS
+	 */
+	public function testSetCORSAPIHeader() {
+		$request = new Request(
+			array('server' => array('HTTP_ORIGIN' => 'test'))
+		);
+		$this->reflector->reflect($this, __FUNCTION__);
+		$middleware = new CORSMiddleware($request, $this->reflector);
+
+		$response = $middleware->afterController($this, __FUNCTION__, new Response());
+		$headers = $response->getHeaders();
+		$this->assertEquals('test', $headers['Access-Control-Allow-Origin']);
+	}
+
+
+	public function testNoAnnotationNoCORSHEADER() {
+		$request = new Request(
+			array('server' => array('HTTP_ORIGIN' => 'test'))
+		);
+		$middleware = new CORSMiddleware($request, $this->reflector);
+
+		$response = $middleware->afterController($this, __FUNCTION__, new Response());
+		$headers = $response->getHeaders();
+		$this->assertFalse(array_key_exists('Access-Control-Allow-Origin', $headers));
+	}
+
+
+	/**
+	 * @CORS
+	 */
+	public function testNoOriginHeaderNoCORSHEADER() {
+		$request = new Request();
+		$this->reflector->reflect($this, __FUNCTION__);
+		$middleware = new CORSMiddleware($request, $this->reflector);
+
+		$response = $middleware->afterController($this, __FUNCTION__, new Response());
+		$headers = $response->getHeaders();
+		$this->assertFalse(array_key_exists('Access-Control-Allow-Origin', $headers));
+	}
+
+
+	/**
+	 * @CORS
+	 * @expectedException \OC\AppFramework\Middleware\Security\SecurityException
+	 */
+	public function testCorsIgnoredIfWithCredentialsHeaderPresent() {
+		$request = new Request(
+			array('server' => array('HTTP_ORIGIN' => 'test'))
+		);
+		$this->reflector->reflect($this, __FUNCTION__);
+		$middleware = new CORSMiddleware($request, $this->reflector);
+
+		$response = new Response();
+		$response->addHeader('AcCess-control-Allow-Credentials ', 'TRUE');
+		$response = $middleware->afterController($this, __FUNCTION__, $response);
+	}
+
+}
diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
index 19e8a68c38..6a1bbf72c1 100644
--- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
+++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
@@ -4,7 +4,7 @@
  * ownCloud - App Framework
  *
  * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -26,6 +26,7 @@ namespace OC\AppFramework\Middleware\Security;
 
 use OC\AppFramework\Http;
 use OC\AppFramework\Http\Request;
+use OC\AppFramework\Utility\ControllerMethodReflector;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\JSONResponse;
 
@@ -37,14 +38,16 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	private $secException;
 	private $secAjaxException;
 	private $request;
+	private $reader;
 
 	public function setUp() {
 		$api = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer', array(), array('test'));
 		$this->controller = $this->getMock('OCP\AppFramework\Controller',
 				array(), array($api, new Request()));
+		$this->reader = new ControllerMethodReflector();
 
 		$this->request = new Request();
-		$this->middleware = new SecurityMiddleware($api, $this->request);
+		$this->middleware = new SecurityMiddleware($api, $this->request, $this->reader);
 		$this->secException = new SecurityException('hey', false);
 		$this->secAjaxException = new SecurityException('hey', true);
 	}
@@ -68,7 +71,8 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 		$api->expects($this->any())->method('getServer')
 			->will($this->returnValue($serverMock));
 
-		$sec = new SecurityMiddleware($api, $this->request);
+		$sec = new SecurityMiddleware($api, $this->request, $this->reader);
+		$this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method);
 		$sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method);
 	}
 
@@ -99,11 +103,12 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 				->will($this->returnValue(true));
 		}
 
-		$sec = new SecurityMiddleware($api, $this->request);
+		$sec = new SecurityMiddleware($api, $this->request, $this->reader);
 
 		try {
-			$sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest',
-					$method);
+			$controller = '\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest';
+			$this->reader->reflect($controller, $method);
+			$sec->beforeController($controller,	$method);
 		} catch (SecurityException $ex){
 			$this->assertEquals($status, $ex->getCode());
 		}
@@ -184,7 +189,9 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 				->method('isLoggedIn')
 				->will($this->returnValue(true));
 
-		$sec = new SecurityMiddleware($api, $this->request);
+		$sec = new SecurityMiddleware($api, $this->request, $this->reader);
+		$this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest',
+				'testNoChecks');
 		$sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest',
 				'testNoChecks');
 	}
@@ -207,7 +214,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 				->will($this->returnValue(true));
 		}
 
-		$sec = new SecurityMiddleware($api, $this->request);
+		$sec = new SecurityMiddleware($api, $this->request, $this->reader);
 
 		if($shouldFail){
 			$this->setExpectedException('\OC\AppFramework\Middleware\Security\SecurityException');
@@ -215,6 +222,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 			$this->setExpectedException(null);
 		}
 
+		$this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method);
 		$sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method);
 	}
 
@@ -230,7 +238,8 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 			->method('passesCSRFCheck')
 			->will($this->returnValue(false));
 
-		$sec = new SecurityMiddleware($api, $request);
+		$sec = new SecurityMiddleware($api, $request, $this->reader);
+		$this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testCsrfCheck');
 		$sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testCsrfCheck');
 	}
 
@@ -246,7 +255,8 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 			->method('passesCSRFCheck')
 			->will($this->returnValue(false));
 
-		$sec = new SecurityMiddleware($api, $request);
+		$sec = new SecurityMiddleware($api, $request, $this->reader);
+		$this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testNoCsrfCheck');
 		$sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testNoCsrfCheck');
 	}
 
@@ -261,7 +271,8 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 			->method('passesCSRFCheck')
 			->will($this->returnValue(true));
 
-		$sec = new SecurityMiddleware($api, $request);
+		$sec = new SecurityMiddleware($api, $request, $this->reader);
+		$this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testFailCsrfCheck');
 		$sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testFailCsrfCheck');
 	}
 
@@ -318,7 +329,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 
 		$this->request = new Request(
 			array('server' => array('HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8')));
-		$this->middleware = new SecurityMiddleware($api, $this->request);
+		$this->middleware = new SecurityMiddleware($api, $this->request, $this->reader);
 		$response = $this->middleware->afterException($this->controller, 'test',
 				$this->secException);
 
diff --git a/tests/lib/appframework/utility/ControllerMethodReflectorTest.php b/tests/lib/appframework/utility/ControllerMethodReflectorTest.php
new file mode 100644
index 0000000000..8939a203ed
--- /dev/null
+++ b/tests/lib/appframework/utility/ControllerMethodReflectorTest.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.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\AppFramework\Utility;
+
+
+class ControllerMethodReflectorTest extends \PHPUnit_Framework_TestCase {
+
+
+	/**
+	 * @Annotation
+	 */
+	public function testReadAnnotation(){
+		$reader = new ControllerMethodReflector();
+		$reader->reflect(
+			'\OC\AppFramework\Utility\ControllerMethodReflectorTest',
+			'testReadAnnotation'
+		);
+
+		$this->assertTrue($reader->hasAnnotation('Annotation'));
+	}
+
+
+	/**
+	 * @Annotation
+	 * @param test
+	 */
+	public function testReadAnnotationNoLowercase(){
+		$reader = new ControllerMethodReflector();
+		$reader->reflect(
+			'\OC\AppFramework\Utility\ControllerMethodReflectorTest',
+			'testReadAnnotationNoLowercase'
+		);
+
+		$this->assertTrue($reader->hasAnnotation('Annotation'));
+		$this->assertFalse($reader->hasAnnotation('param'));
+	}
+
+
+	/**
+	 * @Annotation
+	 * @param int $test
+	 */
+	public function testReadTypeIntAnnotations(){
+		$reader = new ControllerMethodReflector();
+		$reader->reflect(
+			'\OC\AppFramework\Utility\ControllerMethodReflectorTest',
+			'testReadTypeIntAnnotations'
+		);
+
+		$this->assertEquals('int', $reader->getType('test'));
+	}
+
+
+	/**
+	 * @Annotation
+	 * @param double $test something special
+	 */
+	public function testReadTypeDoubleAnnotations(){
+		$reader = new ControllerMethodReflector();
+		$reader->reflect(
+			'\OC\AppFramework\Utility\ControllerMethodReflectorTest',
+			'testReadTypeDoubleAnnotations'
+		);
+
+		$this->assertEquals('double', $reader->getType('test'));
+	}
+
+
+	public function arguments($arg, $arg2='hi') {}
+	public function testReflectParameters() {
+		$reader = new ControllerMethodReflector();
+		$reader->reflect(
+			'\OC\AppFramework\Utility\ControllerMethodReflectorTest',
+			'arguments'
+		);
+
+		$this->assertEquals(array('arg' => null, 'arg2' => 'hi'), $reader->getParameters());	
+	}
+
+
+	public function arguments2($arg) {}
+	public function testReflectParameters2() {
+		$reader = new ControllerMethodReflector();
+		$reader->reflect(
+			'\OC\AppFramework\Utility\ControllerMethodReflectorTest',
+			'arguments2'
+		);
+
+		$this->assertEquals(array('arg' => null), $reader->getParameters());	
+	}
+
+
+}
diff --git a/tests/lib/errorHandler.php b/tests/lib/errorHandler.php
index 32396eafbe..58db80b3c6 100644
--- a/tests/lib/errorHandler.php
+++ b/tests/lib/errorHandler.php
@@ -23,7 +23,7 @@
 class Test_ErrorHandler extends \PHPUnit_Framework_TestCase {
 
 	/**
-	 * @brief provide username, password combinations for testRemovePassword
+	 * provide username, password combinations for testRemovePassword
 	 * @return array
 	 */
 	function passwordProvider() {
@@ -53,7 +53,7 @@ class Test_ErrorHandler extends \PHPUnit_Framework_TestCase {
 }
 
 /**
- * @brief dummy class to access protected methods of \OC\Log\ErrorHandler
+ * dummy class to access protected methods of \OC\Log\ErrorHandler
  */
 class TestableErrorHandler extends \OC\Log\ErrorHandler {
 
diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php
index 5d87693247..8ed2ecabd9 100644
--- a/tests/lib/files/cache/cache.php
+++ b/tests/lib/files/cache/cache.php
@@ -343,7 +343,7 @@ class Cache extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @brief this test show the bug resulting if we have no normalizer installed
+	 * this test show the bug resulting if we have no normalizer installed
 	 */
 	public function testWithoutNormalizer() {
 		// folder name "Schön" with U+00F6 (normalized)
@@ -386,7 +386,7 @@ class Cache extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @brief this test shows that there is no bug if we use the normalizer
+	 * this test shows that there is no bug if we use the normalizer
 	 */
 	public function testWithNormalizer() {
 
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index c85f1128db..201eb9ff6c 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -394,13 +394,12 @@ class View extends \PHPUnit_Framework_TestCase {
 		$this->assertNull($this->hookPath);
 
 		$subView->file_put_contents('/foo.txt', 'asd');
-		$this->assertNotNull($this->hookPath);
 		$this->assertEquals('/substorage/foo.txt', $this->hookPath);
 	}
 
 	private $hookPath;
 
-	function dummyHook($params) {
+	public function dummyHook($params) {
 		$this->hookPath = $params['path'];
 	}
 
@@ -442,12 +441,6 @@ class View extends \PHPUnit_Framework_TestCase {
 		return $storage;
 	}
 
-	private $createHookPath;
-
-	function dummyCreateHook($params) {
-		$this->createHookPath = $params['path'];
-	}
-
 	/**
 	 * @medium
 	 */
@@ -466,23 +459,50 @@ class View extends \PHPUnit_Framework_TestCase {
 		$this->assertNull($this->hookPath);
 	}
 
+	private $hookWritePath;
+	private $hookCreatePath;
+	private $hookUpdatePath;
+
+	public function dummyHookWrite($params) {
+		$this->hookWritePath = $params['path'];
+	}
+
+	public function dummyHookUpdate($params) {
+		$this->hookUpdatePath = $params['path'];
+	}
+
+	public function dummyHookCreate($params) {
+		$this->hookCreatePath = $params['path'];
+	}
+
 	public function testEditNoCreateHook() {
 		$storage1 = $this->getTestStorage();
 		$storage2 = $this->getTestStorage();
 		$defaultRoot = \OC\Files\Filesystem::getRoot();
 		\OC\Files\Filesystem::mount($storage1, array(), '/');
 		\OC\Files\Filesystem::mount($storage2, array(), $defaultRoot);
-		\OC_Hook::connect('OC_Filesystem', 'post_create', $this, 'dummyCreateHook');
+		\OC_Hook::connect('OC_Filesystem', 'post_create', $this, 'dummyHookCreate');
+		\OC_Hook::connect('OC_Filesystem', 'post_update', $this, 'dummyHookUpdate');
+		\OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHookWrite');
 
 		$view = new \OC\Files\View($defaultRoot);
-		$this->hookPath = null;
+		$this->hookWritePath = $this->hookUpdatePath = $this->hookCreatePath = null;
 
 		$view->file_put_contents('/asd.txt', 'foo');
-		$this->assertEquals('/asd.txt', $this->createHookPath);
-		$this->createHookPath = null;
+		$this->assertEquals('/asd.txt', $this->hookCreatePath);
+		$this->assertNull($this->hookUpdatePath);
+		$this->assertEquals('/asd.txt', $this->hookWritePath);
+
+		$this->hookWritePath = $this->hookUpdatePath = $this->hookCreatePath = null;
 
 		$view->file_put_contents('/asd.txt', 'foo');
-		$this->assertNull($this->createHookPath);
+		$this->assertNull($this->hookCreatePath);
+		$this->assertEquals('/asd.txt', $this->hookUpdatePath);
+		$this->assertEquals('/asd.txt', $this->hookWritePath);
+
+		\OC_Hook::clear('OC_Filesystem', 'post_create');
+		\OC_Hook::clear('OC_Filesystem', 'post_update');
+		\OC_Hook::clear('OC_Filesystem', 'post_write');
 	}
 
 	/**
@@ -565,4 +585,24 @@ class View extends \PHPUnit_Framework_TestCase {
 		$info2 = $view->getFileInfo('/test/test');
 		$this->assertSame($info['etag'], $info2['etag']);
 	}
+
+	/**
+	 * @dataProvider absolutePathProvider
+	 */
+	public function testGetAbsolutePath($expectedPath, $relativePath) {
+		$view = new \OC\Files\View('/files');
+		$this->assertEquals($expectedPath, $view->getAbsolutePath($relativePath));
+	}
+
+	function absolutePathProvider() {
+		return array(
+			array('/files/', ''),
+			array('/files/0', '0'),
+			array('/files/false', 'false'),
+			array('/files/true', 'true'),
+			array('/files/', '/'),
+			array('/files/test', 'test'),
+			array('/files/test', '/test'),
+		);
+	}
 }
diff --git a/tests/lib/group.php b/tests/lib/group.php
index 8de8d033e1..724e723b18 100644
--- a/tests/lib/group.php
+++ b/tests/lib/group.php
@@ -4,8 +4,8 @@
  *
  * @author Robin Appelman
  * @author Bernhard Posselt
- * @copyright 2012 Robin Appelman icewind@owncloud.com
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Robin Appelman <icewind@owncloud.com>
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -109,25 +109,6 @@ class Test_Group extends PHPUnit_Framework_TestCase {
 		$this->assertEquals(array(), OC_Group::getGroups());
 	}
 
-	public function testDisplayNamesInGroup() {
-		OC_Group::useBackend(new OC_Group_Dummy());
-		$userBackend = new \OC_User_Dummy();
-		\OC_User::getManager()->registerBackend($userBackend);
-
-		$group1 = uniqid();
-		$user1 = 'uid1';
-		$user2 = 'uid2';
-		OC_Group::createGroup($group1);
-		$userBackend->createUser($user1, '');
-		$userBackend->createUser($user2, '');
-		OC_Group::addToGroup($user1, $group1);
-		OC_Group::addToGroup($user2, $group1);
-		//Dummy backend does not support setting displaynames, uid will always
-		//be returned. This checks primarily, that the return format is okay.
-		$expected = array($user1 => $user1, $user2 => $user2);
-		$this->assertEquals($expected, OC_Group::displayNamesInGroup($group1));
-	}
-
 	public function testUsersInGroup() {
 		OC_Group::useBackend(new OC_Group_Dummy());
 		$userBackend = new \OC_User_Dummy();
diff --git a/tests/lib/group/group.php b/tests/lib/group/group.php
index 990f8ecc1d..4d15999a82 100644
--- a/tests/lib/group/group.php
+++ b/tests/lib/group/group.php
@@ -17,9 +17,10 @@ class Group extends \PHPUnit_Framework_TestCase {
 	 */
 	protected function getUserManager() {
 		$userManager = $this->getMock('\OC\User\Manager');
-		$user1 = new User('user1', null);
-		$user2 = new User('user2', null);
-		$user3 = new User('user3', null);
+		$backend = $this->getMock('\OC_User_Backend');
+		$user1 = new User('user1', $backend);
+		$user2 = new User('user2', $backend);
+		$user3 = new User('user3', $backend);
 		$userManager->expects($this->any())
 			->method('get')
 			->will($this->returnValueMap(array(
@@ -79,6 +80,7 @@ class Group extends \PHPUnit_Framework_TestCase {
 	public function testInGroupSingleBackend() {
 		$backend = $this->getMock('OC_Group_Database');
 		$userManager = $this->getUserManager();
+		$userBackend = $this->getMock('\OC_User_Backend');
 		$group = new \OC\Group\Group('group1', array($backend), $userManager);
 
 		$backend->expects($this->once())
@@ -86,13 +88,14 @@ class Group extends \PHPUnit_Framework_TestCase {
 			->with('user1', 'group1')
 			->will($this->returnValue(true));
 
-		$this->assertTrue($group->inGroup(new User('user1', null)));
+		$this->assertTrue($group->inGroup(new User('user1', $userBackend)));
 	}
 
 	public function testInGroupMultipleBackends() {
 		$backend1 = $this->getMock('OC_Group_Database');
 		$backend2 = $this->getMock('OC_Group_Database');
 		$userManager = $this->getUserManager();
+		$userBackend = $this->getMock('\OC_User_Backend');
 		$group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager);
 
 		$backend1->expects($this->once())
@@ -105,12 +108,13 @@ class Group extends \PHPUnit_Framework_TestCase {
 			->with('user1', 'group1')
 			->will($this->returnValue(true));
 
-		$this->assertTrue($group->inGroup(new User('user1', null)));
+		$this->assertTrue($group->inGroup(new User('user1', $userBackend)));
 	}
 
 	public function testAddUser() {
 		$backend = $this->getMock('OC_Group_Database');
 		$userManager = $this->getUserManager();
+		$userBackend = $this->getMock('\OC_User_Backend');
 		$group = new \OC\Group\Group('group1', array($backend), $userManager);
 
 		$backend->expects($this->once())
@@ -125,12 +129,13 @@ class Group extends \PHPUnit_Framework_TestCase {
 			->method('addToGroup')
 			->with('user1', 'group1');
 
-		$group->addUser(new User('user1', null));
+		$group->addUser(new User('user1', $userBackend));
 	}
 
 	public function testAddUserAlreadyInGroup() {
 		$backend = $this->getMock('OC_Group_Database');
 		$userManager = $this->getUserManager();
+		$userBackend = $this->getMock('\OC_User_Backend');
 		$group = new \OC\Group\Group('group1', array($backend), $userManager);
 
 		$backend->expects($this->once())
@@ -144,12 +149,13 @@ class Group extends \PHPUnit_Framework_TestCase {
 		$backend->expects($this->never())
 			->method('addToGroup');
 
-		$group->addUser(new User('user1', null));
+		$group->addUser(new User('user1', $userBackend));
 	}
 
 	public function testRemoveUser() {
 		$backend = $this->getMock('OC_Group_Database');
 		$userManager = $this->getUserManager();
+		$userBackend = $this->getMock('\OC_User_Backend');
 		$group = new \OC\Group\Group('group1', array($backend), $userManager);
 
 		$backend->expects($this->once())
@@ -164,12 +170,13 @@ class Group extends \PHPUnit_Framework_TestCase {
 			->method('removeFromGroup')
 			->with('user1', 'group1');
 
-		$group->removeUser(new User('user1', null));
+		$group->removeUser(new User('user1', $userBackend));
 	}
 
 	public function testRemoveUserNotInGroup() {
 		$backend = $this->getMock('OC_Group_Database');
 		$userManager = $this->getUserManager();
+		$userBackend = $this->getMock('\OC_User_Backend');
 		$group = new \OC\Group\Group('group1', array($backend), $userManager);
 
 		$backend->expects($this->once())
@@ -183,13 +190,14 @@ class Group extends \PHPUnit_Framework_TestCase {
 		$backend->expects($this->never())
 			->method('removeFromGroup');
 
-		$group->removeUser(new User('user1', null));
+		$group->removeUser(new User('user1', $userBackend));
 	}
 
 	public function testRemoveUserMultipleBackends() {
 		$backend1 = $this->getMock('OC_Group_Database');
 		$backend2 = $this->getMock('OC_Group_Database');
 		$userManager = $this->getUserManager();
+		$userBackend = $this->getMock('\OC_User_Backend');
 		$group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager);
 
 		$backend1->expects($this->once())
@@ -216,7 +224,7 @@ class Group extends \PHPUnit_Framework_TestCase {
 			->method('removeFromGroup')
 			->with('user1', 'group1');
 
-		$group->removeUser(new User('user1', null));
+		$group->removeUser(new User('user1', $userBackend));
 	}
 
 	public function testSearchUsers() {
diff --git a/tests/lib/group/manager.php b/tests/lib/group/manager.php
index a03997c58e..6799a598d4 100644
--- a/tests/lib/group/manager.php
+++ b/tests/lib/group/manager.php
@@ -294,10 +294,11 @@ class Manager extends \PHPUnit_Framework_TestCase {
 		 * @var \OC\User\Manager $userManager
 		 */
 		$userManager = $this->getMock('\OC\User\Manager');
+		$userBackend = $this->getMock('\OC_User_Backend');
 		$manager = new \OC\Group\Manager($userManager);
 		$manager->addBackend($backend);
 
-		$groups = $manager->getUserGroups(new User('user1', null));
+		$groups = $manager->getUserGroups(new User('user1', $userBackend));
 		$this->assertEquals(1, count($groups));
 		$group1 = $groups[0];
 		$this->assertEquals('group1', $group1->getGID());
@@ -332,15 +333,163 @@ class Manager extends \PHPUnit_Framework_TestCase {
 		 * @var \OC\User\Manager $userManager
 		 */
 		$userManager = $this->getMock('\OC\User\Manager');
+		$userBackend = $this->getMock('\OC_User_Backend');
 		$manager = new \OC\Group\Manager($userManager);
 		$manager->addBackend($backend1);
 		$manager->addBackend($backend2);
 
-		$groups = $manager->getUserGroups(new User('user1', null));
+		$groups = $manager->getUserGroups(new User('user1', $userBackend));
 		$this->assertEquals(2, count($groups));
 		$group1 = $groups[0];
 		$group2 = $groups[1];
 		$this->assertEquals('group1', $group1->getGID());
 		$this->assertEquals('group2', $group2->getGID());
 	}
+
+	public function testDisplayNamesInGroupMultipleUserBackends() {
+		$userBackend = $this->getMock('\OC_User_Backend');
+
+		$user1 = new User('user1', $userBackend);
+		$user2 = new User('user2', $userBackend);
+		$user3 = new User('user3', $userBackend);
+		$user4 = new User('user33', $userBackend);
+
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1
+		 */
+		$backend = $this->getMock('\OC_Group_Database');
+		$backend->expects($this->exactly(1))
+			->method('groupExists')
+			->with('testgroup')
+			->will($this->returnValue(true));
+
+		$backend->expects($this->once())
+			->method('usersInGroup')
+			->with('testgroup', '', -1, 0)
+			->will($this->returnValue(array('user2', 'user33')));
+
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+		$userBackend = $this->getMock('\OC_User_Backend');
+		$userManager->expects($this->once())
+			->method('search')
+			->with('user3')
+			->will($this->returnValue(array('user3' => $user3, 'user33' => $user4)));
+
+		$userManager->expects($this->any())
+			->method('get')
+			->will($this->returnCallback(function($uid) use ($userBackend) {
+				switch($uid) {
+					case 'user1' : return new User('user1', $userBackend);
+					case 'user2' : return new User('user2', $userBackend);
+					case 'user3' : return new User('user3', $userBackend);
+					case 'user33': return new User('user33', $userBackend);
+					default:
+						return null;
+				}
+			}));
+
+		$manager = new \OC\Group\Manager($userManager);
+		$manager->addBackend($backend);
+
+		$users = $manager->displayNamesInGroup('testgroup', 'user3');
+		$this->assertEquals(1, count($users));
+		$this->assertTrue(isset($users['user33']));
+	}
+
+	public function testGetUserGroupsWithAddUser() {
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend
+		 */
+		$backend = $this->getMock('\OC_Group_Database');
+		$expectedGroups = array();
+		$backend->expects($this->any())
+			->method('getUserGroups')
+			->with('user1')
+			->will($this->returnCallback(function () use (&$expectedGroups) {
+				return $expectedGroups;
+			}));
+		$backend->expects($this->any())
+			->method('groupExists')
+			->with('group1')
+			->will($this->returnValue(true));
+		$backend->expects($this->once())
+			->method('implementsActions')
+			->will($this->returnValue(true));
+
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+		$manager = new \OC\Group\Manager($userManager);
+		$manager->addBackend($backend);
+
+		// prime cache
+		$user1 = new User('user1', null);
+		$groups = $manager->getUserGroups($user1);
+		$this->assertEquals(array(), $groups);
+
+		// add user
+		$group = $manager->get('group1');
+		$group->addUser($user1);
+		$expectedGroups = array('group1');
+
+		// check result
+		$groups = $manager->getUserGroups($user1);
+		$this->assertEquals(1, count($groups));
+		$group1 = $groups[0];
+		$this->assertEquals('group1', $group1->getGID());
+	}
+
+	public function testGetUserGroupsWithRemoveUser() {
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend
+		 */
+		$backend = $this->getMock('\OC_Group_Database');
+		$expectedGroups = array('group1');
+		$backend->expects($this->any())
+			->method('getUserGroups')
+			->with('user1')
+			->will($this->returnCallback(function () use (&$expectedGroups) {
+				return $expectedGroups;
+			}));
+		$backend->expects($this->any())
+			->method('groupExists')
+			->with('group1')
+			->will($this->returnValue(true));
+		$backend->expects($this->once())
+			->method('implementsActions')
+			->will($this->returnValue(true));
+		$backend->expects($this->once())
+			->method('inGroup')
+			->will($this->returnValue(true));
+		$backend->expects($this->once())
+			->method('removeFromGroup')
+			->will($this->returnValue(true));
+
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+		$manager = new \OC\Group\Manager($userManager);
+		$manager->addBackend($backend);
+
+		// prime cache
+		$user1 = new User('user1', null);
+		$groups = $manager->getUserGroups($user1);
+		$this->assertEquals(1, count($groups));
+		$group1 = $groups[0];
+		$this->assertEquals('group1', $group1->getGID());
+
+		// remove user
+		$group = $manager->get('group1');
+		$group->removeUser($user1);
+		$expectedGroups = array();
+
+		// check result
+		$groups = $manager->getUserGroups($user1);
+		$this->assertEquals(array(), $groups);
+	}
 }
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index 5d319e40f0..cfd66e9970 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -30,6 +30,28 @@ class Test_Helper extends PHPUnit_Framework_TestCase {
 		);
 	}
 
+	/**
+	 * @dataProvider phpFileSizeProvider
+	 */
+	public function testPhpFileSize($expected, $input)
+	{
+		$result = OC_Helper::phpFileSize($input);
+		$this->assertEquals($expected, $result);
+	}
+
+	public function phpFileSizeProvider()
+	{
+		return array(
+			array('0B', 0),
+			array('1K', 1024),
+			array('9.5M', 10000000),
+			array('1.3G', 1395864371),
+			array('465.7G', 500000000000),
+			array('465661.3G', 500000000000000),
+			array('465661287.3G', 500000000000000000),
+		);
+	}
+
 	/**
 	 * @dataProvider computerFileSizeProvider
 	 */
@@ -98,15 +120,15 @@ class Test_Helper extends PHPUnit_Framework_TestCase {
 		$this->assertEquals($result, $expected);
 	}
 
-	function testIssubdirectory() {
-		$result = OC_Helper::issubdirectory("./data/", "/anotherDirectory/");
+	function testIsSubDirectory() {
+		$result = OC_Helper::isSubDirectory("./data/", "/anotherDirectory/");
 		$this->assertFalse($result);
 
-		$result = OC_Helper::issubdirectory("./data/", "./data/");
+		$result = OC_Helper::isSubDirectory("./data/", "./data/");
 		$this->assertTrue($result);
 
 		mkdir("data/TestSubdirectory", 0777);
-		$result = OC_Helper::issubdirectory("data/TestSubdirectory/", "data");
+		$result = OC_Helper::isSubDirectory("data/TestSubdirectory/", "data");
 		rmdir("data/TestSubdirectory");
 		$this->assertTrue($result);
 	}
@@ -134,7 +156,7 @@ class Test_Helper extends PHPUnit_Framework_TestCase {
 			);
 		$result = OC_Helper::mb_array_change_key_case($arrayStart, MB_CASE_UPPER);
 		$expected = $arrayResult;
-		$this->assertEquals($result, $expected);	
+		$this->assertEquals($result, $expected);
 	}
 
 	function testMb_substr_replace() {
@@ -257,4 +279,179 @@ class Test_Helper extends PHPUnit_Framework_TestCase {
 			array(3670, true, \OC::$SERVERROOT . '/tests/data/testimage.png', \OC::$SERVERROOT . '/tests/data/testimage-copy.png'),
 		);
 	}
+
+	// Url generator methods
+
+	/**
+	 * @small
+	 * test absolute URL construction
+	 * @dataProvider provideDocRootURLs
+	 */
+	function testMakeAbsoluteURLDocRoot($url, $expectedResult) {
+		\OC::$WEBROOT = '';
+		$result = \OC_Helper::makeURLAbsolute($url);
+
+		$this->assertEquals($expectedResult, $result);
+	}
+
+	/**
+	 * @small
+	 * test absolute URL construction
+	 * @dataProvider provideSubDirURLs
+	 */
+	function testMakeAbsoluteURLSubDir($url, $expectedResult) {
+		\OC::$WEBROOT = '/owncloud';
+		$result = \OC_Helper::makeURLAbsolute($url);
+
+		$this->assertEquals($expectedResult, $result);
+	}
+
+	public function provideDocRootURLs() {
+		return array(
+			array('index.php', 'http://localhost/index.php'),
+			array('/index.php', 'http://localhost/index.php'),
+			array('/apps/index.php', 'http://localhost/apps/index.php'),
+			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'),
+		);
+	}
+
+	/**
+	 * @small
+	 * test linkTo URL construction
+	 * @dataProvider provideDocRootAppUrlParts
+	 */
+	public function testLinkToDocRoot($app, $file, $args, $expectedResult) {
+		\OC::$WEBROOT = '';
+		$result = \OC_Helper::linkTo($app, $file, $args);
+
+		$this->assertEquals($expectedResult, $result);
+	}
+
+	/**
+	 * @small
+	 * test linkTo URL construction in sub directory
+	 * @dataProvider provideSubDirAppUrlParts
+	 */
+	public function testLinkToSubDir($app, $file, $args, $expectedResult) {
+		\OC::$WEBROOT = '/owncloud';
+		$result = \OC_Helper::linkTo($app, $file, $args);
+
+		$this->assertEquals($expectedResult, $result);
+	}
+
+	public function provideDocRootAppUrlParts() {
+		return array(
+			array('files', 'index.php', array(), '/index.php/apps/files'),
+			array('files', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/index.php/apps/files?trut=trat&dut=dat'),
+			array('', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/index.php?trut=trat&dut=dat'),
+		);
+	}
+
+	public function provideSubDirAppUrlParts() {
+		return array(
+			array('files', 'index.php', array(), '/owncloud/index.php/apps/files'),
+			array('files', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/owncloud/index.php/apps/files?trut=trat&dut=dat'),
+			array('', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/owncloud/index.php?trut=trat&dut=dat'),
+		);
+	}
+
+	/**
+	 * @small
+	 * test linkToAbsolute URL construction
+	 * @dataProvider provideDocRootAppAbsoluteUrlParts
+	 */
+	public function testLinkToAbsoluteDocRoot($app, $file, $args, $expectedResult) {
+		\OC::$WEBROOT = '';
+		$result = \OC_Helper::linkToAbsolute($app, $file, $args);
+
+		$this->assertEquals($expectedResult, $result);
+	}
+
+	/**
+	 * @small
+	 * test linkToAbsolute URL construction in sub directory
+	 * @dataProvider provideSubDirAppAbsoluteUrlParts
+	 */
+	public function testLinkToAbsoluteSubDir($app, $file, $args, $expectedResult) {
+		\OC::$WEBROOT = '/owncloud';
+		$result = \OC_Helper::linkToAbsolute($app, $file, $args);
+
+		$this->assertEquals($expectedResult, $result);
+	}
+
+	public function provideDocRootAppAbsoluteUrlParts() {
+		return array(
+			array('files', 'index.php', array(), 'http://localhost/index.php/apps/files'),
+			array('files', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), 'http://localhost/index.php/apps/files?trut=trat&dut=dat'),
+			array('', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), 'http://localhost/index.php?trut=trat&dut=dat'),
+		);
+	}
+
+	public function provideSubDirAppAbsoluteUrlParts() {
+		return array(
+			array('files', 'index.php', array(), 'http://localhost/owncloud/index.php/apps/files'),
+			array('files', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), 'http://localhost/owncloud/index.php/apps/files?trut=trat&dut=dat'),
+			array('', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), 'http://localhost/owncloud/index.php?trut=trat&dut=dat'),
+		);
+	}
+
+	/**
+	 * @small
+	 * test linkToRemoteBase URL construction
+	 */
+	public function testLinkToRemoteBase() {
+		\OC::$WEBROOT = '';
+		$result = \OC_Helper::linkToRemoteBase('webdav');
+		$this->assertEquals('/remote.php/webdav', $result);
+
+		\OC::$WEBROOT = '/owncloud';
+		$result = \OC_Helper::linkToRemoteBase('webdav');
+		$this->assertEquals('/owncloud/remote.php/webdav', $result);
+	}
+
+	/**
+	 * @small
+	 * test linkToRemote URL construction
+	 */
+	public function testLinkToRemote() {
+		\OC::$WEBROOT = '';
+		$result = \OC_Helper::linkToRemote('webdav');
+		$this->assertEquals('http://localhost/remote.php/webdav/', $result);
+		$result = \OC_Helper::linkToRemote('webdav', false);
+		$this->assertEquals('http://localhost/remote.php/webdav', $result);
+
+		\OC::$WEBROOT = '/owncloud';
+		$result = \OC_Helper::linkToRemote('webdav');
+		$this->assertEquals('http://localhost/owncloud/remote.php/webdav/', $result);
+		$result = \OC_Helper::linkToRemote('webdav', false);
+		$this->assertEquals('http://localhost/owncloud/remote.php/webdav', $result);
+	}
+
+	/**
+	 * @small
+	 * test linkToPublic URL construction
+	 */
+	public function testLinkToPublic() {
+		\OC::$WEBROOT = '';
+		$result = \OC_Helper::linkToPublic('files');
+		$this->assertEquals('http://localhost/public.php?service=files', $result);
+		$result = \OC_Helper::linkToPublic('files', false);
+		$this->assertEquals('http://localhost/public.php?service=files', $result);
+
+		\OC::$WEBROOT = '/owncloud';
+		$result = \OC_Helper::linkToPublic('files');
+		$this->assertEquals('http://localhost/owncloud/public.php?service=files', $result);
+		$result = \OC_Helper::linkToPublic('files', false);
+		$this->assertEquals('http://localhost/owncloud/public.php?service=files', $result);
+	}
+
 }
diff --git a/tests/lib/logger.php b/tests/lib/logger.php
new file mode 100644
index 0000000000..7d5d4049b2
--- /dev/null
+++ b/tests/lib/logger.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright (c) 2014 Thomas Müller <thomas.mueller@tmit.eu>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test;
+
+use OC\Log;
+
+class Logger extends \PHPUnit_Framework_TestCase {
+	/**
+	 * @var \OCP\ILogger
+	 */
+	private $logger;
+	static private $logs = array();
+
+	public function setUp() {
+		self::$logs = array();
+		$this->logger = new Log($this);
+	}
+
+	public function testInterpolation() {
+		$logger = $this->logger;
+		$logger->info('{Message {nothing} {user} {foo.bar} a}', array('user' => 'Bob', 'foo.bar' => 'Bar'));
+
+		$expected = array('1 {Message {nothing} Bob Bar a}');
+		$this->assertEquals($expected, $this->getLogs());
+	}
+
+	private function getLogs() {
+		return self::$logs;
+	}
+
+	public static function write($app, $message, $level) {
+		self::$logs[]= "$level $message";
+	}
+}
diff --git a/tests/lib/migrate.php b/tests/lib/migrate.php
index d438a7a692..c4442511e1 100644
--- a/tests/lib/migrate.php
+++ b/tests/lib/migrate.php
@@ -12,7 +12,7 @@ class Test_Migrate extends PHPUnit_Framework_TestCase {
 	public $tmpfiles = array();
 
 	/**
-	 * @brief Generates a test user and sets up their file system
+	 * Generates a test user and sets up their file system
 	 * @return string the test users id
 	 */
 	public function generateUser() {
@@ -27,8 +27,8 @@ class Test_Migrate extends PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @brief validates an export for a user
-	 * @brief checks for existence of export_info.json and file folder
+	 * validates an export for a user
+	 * checks for existence of export_info.json and file folder
 	 * @param string $exportedUser the user that was exported
 	 * @param string $path the path to the .zip export
 	 * @param string $exportedBy
diff --git a/tests/lib/tags.php b/tests/lib/tags.php
index 97e3734cfd..976b4b4fdc 100644
--- a/tests/lib/tags.php
+++ b/tests/lib/tags.php
@@ -130,7 +130,7 @@ class Test_Tags extends PHPUnit_Framework_TestCase {
 		$tagger = $this->tagMgr->load($this->objectType);
 
 		foreach($objids as $id) {
-			$tagger->tagAs($id, 'Family');
+			$this->assertTrue($tagger->tagAs($id, 'Family'));
 		}
 
 		$this->assertEquals(1, count($tagger->getTags()));
diff --git a/tests/lib/template.php b/tests/lib/template.php
index b3d0975b79..819d592aac 100644
--- a/tests/lib/template.php
+++ b/tests/lib/template.php
@@ -3,7 +3,7 @@
 * ownCloud
 *
 * @author Bernhard Posselt
-* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+* @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -27,52 +27,32 @@ class Test_TemplateFunctions extends PHPUnit_Framework_TestCase {
 		$loader->load('OC_Template');
 	}
 
-	public function testP() {
-		$badString = '<img onload="alert(1)" />';
-		ob_start();
-		p($badString);
-		$result = ob_get_clean();
-		$this->assertEquals('&lt;img onload=&quot;alert(1)&quot; /&gt;', $result);
+	public function testPJavaScript() {
+		$this->expectOutputString('&lt;img onload=&quot;alert(1)&quot; /&gt;');
+		p('<img onload="alert(1)" />');
+	}
 
-		$badString = "<script>alert('Hacked!');</script>";
-		ob_start();
-		p($badString);
-		$result = ob_get_clean();
-		$this->assertEquals('&lt;script&gt;alert(&#039;Hacked!&#039;);&lt;/script&gt;', $result);
-
-		$goodString = 'This is a good string without HTML.';
-		ob_start();
-		p($goodString);
-		$result = ob_get_clean();
-		$this->assertEquals('This is a good string without HTML.', $result);
+	public function testPJavaScriptWithScriptTags() {
+		$this->expectOutputString('&lt;script&gt;alert(&#039;Hacked!&#039;);&lt;/script&gt;');
+		p("<script>alert('Hacked!');</script>");
 	}
 
 	public function testPNormalString() {
-		$normalString = "This is a good string!";
-		ob_start();
-		p($normalString);
-		$result = ob_get_clean();
-
-		$this->assertEquals("This is a good string!", $result);
+		$string = 'This is a good string without HTML.';
+		$this->expectOutputString($string);
+		p($string);
 	}
 
 	public function testPrintUnescaped() {
 		$htmlString = "<script>alert('xss');</script>";
-
-		ob_start();
+		$this->expectOutputString($htmlString);
 		print_unescaped($htmlString);
-		$result = ob_get_clean();
-
-		$this->assertEquals($htmlString, $result);
 	}
 
 	public function testPrintUnescapedNormalString() {
-		$normalString = "This is a good string!";
-		ob_start();
-		print_unescaped($normalString);
-		$result = ob_get_clean();
-
-		$this->assertEquals("This is a good string!", $result);
+		$string = 'This is a good string!';
+		$this->expectOutputString($string);
+		print_unescaped($string);
 	}
 
 	// ---------------------------------------------------------------------------
diff --git a/tests/lib/urlgenerator.php b/tests/lib/urlgenerator.php
index 8e605d88f3..888512ee42 100644
--- a/tests/lib/urlgenerator.php
+++ b/tests/lib/urlgenerator.php
@@ -8,10 +8,53 @@
 
 class Test_Urlgenerator extends PHPUnit_Framework_TestCase {
 
+	/**
+	 * @small
+	 * test linkTo URL construction
+	 * @dataProvider provideDocRootAppUrlParts
+	 */
+	public function testLinkToDocRoot($app, $file, $args, $expectedResult) {
+		\OC::$WEBROOT = '';
+		$config = $this->getMock('\OCP\IConfig');
+		$urlGenerator = new \OC\URLGenerator($config);
+		$result = $urlGenerator->linkTo($app, $file, $args);
+
+		$this->assertEquals($expectedResult, $result);
+	}
 
 	/**
 	 * @small
-	 * @brief test absolute URL construction
+	 * test linkTo URL construction in sub directory
+	 * @dataProvider provideSubDirAppUrlParts
+	 */
+	public function testLinkToSubDir($app, $file, $args, $expectedResult) {
+		\OC::$WEBROOT = '/owncloud';
+		$config = $this->getMock('\OCP\IConfig');
+		$urlGenerator = new \OC\URLGenerator($config);
+		$result = $urlGenerator->linkTo($app, $file, $args);
+
+		$this->assertEquals($expectedResult, $result);
+	}
+
+	public function provideDocRootAppUrlParts() {
+		return array(
+			array('files', 'index.php', array(), '/index.php/apps/files'),
+			array('files', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/index.php/apps/files?trut=trat&dut=dat'),
+			array('', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/index.php?trut=trat&dut=dat'),
+		);
+	}
+
+	public function provideSubDirAppUrlParts() {
+		return array(
+			array('files', 'index.php', array(), '/owncloud/index.php/apps/files'),
+			array('files', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/owncloud/index.php/apps/files?trut=trat&dut=dat'),
+			array('', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/owncloud/index.php?trut=trat&dut=dat'),
+		);
+	}
+
+	/**
+	 * @small
+	 * test absolute URL construction
 	 * @dataProvider provideDocRootURLs
 	 */
 	function testGetAbsoluteURLDocRoot($url, $expectedResult) {
@@ -25,7 +68,7 @@ class Test_Urlgenerator extends PHPUnit_Framework_TestCase {
 
 	/**
 	 * @small
-	 * @brief test absolute URL construction
+	 * test absolute URL construction
 	 * @dataProvider provideSubDirURLs
 	 */
 	function testGetAbsoluteURLSubDir($url, $expectedResult) {
diff --git a/tests/lib/user/manager.php b/tests/lib/user/manager.php
index 8ca0f94c6f..fd0931af7e 100644
--- a/tests/lib/user/manager.php
+++ b/tests/lib/user/manager.php
@@ -190,8 +190,8 @@ class Manager extends \PHPUnit_Framework_TestCase {
 
 		$result = $manager->search('fo');
 		$this->assertEquals(2, count($result));
-		$this->assertEquals('afoo', $result[0]->getUID());
-		$this->assertEquals('foo', $result[1]->getUID());
+		$this->assertEquals('afoo', array_shift($result)->getUID());
+		$this->assertEquals('foo', array_shift($result)->getUID());
 	}
 
 	public function testSearchTwoBackendLimitOffset() {
@@ -219,9 +219,9 @@ class Manager extends \PHPUnit_Framework_TestCase {
 
 		$result = $manager->search('fo', 3, 1);
 		$this->assertEquals(3, count($result));
-		$this->assertEquals('foo1', $result[0]->getUID());
-		$this->assertEquals('foo2', $result[1]->getUID());
-		$this->assertEquals('foo3', $result[2]->getUID());
+		$this->assertEquals('foo1', array_shift($result)->getUID());
+		$this->assertEquals('foo2', array_shift($result)->getUID());
+		$this->assertEquals('foo3', array_shift($result)->getUID());
 	}
 
 	public function testCreateUserSingleBackendNotExists() {